no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/exchange/GiftExchangeCodeBean.java

@@ -1,24 +0,0 @@
-package com.gree.mall.manager.bean.exchange;
-
-import com.gree.mall.manager.plus.entity.GiftExchangeCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel
-@Data
-public class GiftExchangeCodeBean extends GiftExchangeCode {
-
-    @ApiModelProperty("数量")
-    private Integer num;
-    @ApiModelProperty("初次生成时间")
-    private Date firstTime;
-    @ApiModelProperty("使用数量")
-    private Integer useNum;
-    @ApiModelProperty("总生成金额")
-    private BigDecimal totalAmount;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/OrderInfoAddBean.java

@@ -44,18 +44,6 @@ public class OrderInfoAddBean {
     @NotNull(message = "支付方式不能为空")
     @ApiModelProperty("支付方式 WECHAT=微信支付 CASH=现金支付 TRANSFER=转账支付")
     private PayTypeEnum payType;
-//    @NotBlank(message = "省id不能为空")
-//    @ApiModelProperty("省id")
-//    private String provinceId;
-//    @NotBlank(message = "市id不能为空")
-//    @ApiModelProperty("市id")
-//    private String cityId;
-//    @NotBlank(message = "区id不能为空")
-//    @ApiModelProperty("区id")
-//    private String areaId;
-//    @NotBlank(message = "街道id不能为空")
-//    @ApiModelProperty("街道id")
-//    private String streetId;
     @NotBlank(message = "省不能为空")
     private String province;
     @NotBlank(message = "市不能为空")
@@ -76,15 +64,9 @@ public class OrderInfoAddBean {
     @ApiModelProperty("备注")
     private String remark;
 
-    @ApiModelProperty("是否以旧换新 YES 是 NO否")
-    private String isOld;
-
     @NotNull(message = "商品明细不能为空")
     @ApiModelProperty("商品明细(只用传 物料编号，数量，单价)")
     private List<OrderDetail> orderDetails;
 
 
-    @ApiModelProperty("回收信息明细")
-    private List<OrderOldProductAdd> orderOldProductAdds;
-
 }

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CountMapper.java

@@ -3,7 +3,6 @@ package com.gree.mall.manager.commonmapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.manager.bean.count.*;
-import com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean;
 import com.gree.mall.manager.bean.settle.DataBoardBean;
 import com.gree.mall.manager.bean.settle.MonthSendWorkerBean;
 import org.apache.ibatis.annotations.Mapper;
@@ -68,13 +67,6 @@ public interface CountMapper {
     public Map<String,Object> countWebsitAmount(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("websitNumbers") List<String> websitNumbers);
 
 
-    /**
-     *  优惠券统计列表
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public IPage<GiftExchangeCodeBean> queryExchangeCodeCountList(IPage page,@Param("keyword") String keyword,@Param("adminWebsitId") String adminWebsitId,@Param("companyWechatIds") List<String> companyWechatIds);
-
-
     DataBoardBean countTotalSettleExpense(@Param("companyWechatId") String companyWechatId, @Param("websitId") String websitId);
 
     DataBoardBean countTotalSettleSend(@Param("companyWechatId") String companyWechatId, @Param("websitId") String websitId);

mall-server-api/src/main/java/com/gree/mall/manager/controller/ManuelController.java

@@ -1,77 +0,0 @@
-package com.gree.mall.manager.controller;
-
-import com.gree.mall.manager.enums.ExchangeCodeTypeEnum;
-import com.gree.mall.manager.logic.ExpressLogic;
-import com.gree.mall.manager.plus.entity.GiftExchangeCode;
-import com.gree.mall.manager.plus.service.GiftExchangeCodeService;
-import com.gree.mall.manager.utils.RC4Utils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-@Slf4j
-@RestController
-@Api(value = "手动操作接口", tags ={"手动操作接口"} )
-@RequestMapping(value = "/manuel", produces = "application/json; charset=utf-8")
-public class ManuelController {
-    @Autowired
-    private ExpressLogic expressLogic;
-    @Autowired
-    GiftExchangeCodeService giftExchangeCodeService;
-
-    @PostMapping("/excode/init")
-    public void initExcode(){
-        int count = giftExchangeCodeService.count();
-        if(count > 0){
-            return;
-        }
-        List<GiftExchangeCode> list = new ArrayList<>();
-        for(int i = 0 ;i < 3000;i++){
-            String s = RC4Utils.encry_RC4_string(String.format("%04d", 1), UUID.randomUUID().toString());
-            GiftExchangeCode giftExchangeCode = new GiftExchangeCode();
-            giftExchangeCode.setId(s);
-            giftExchangeCode.setStatus(0);
-            giftExchangeCode.setCreateTime(new Date());
-            if(i >= 2000) {
-                giftExchangeCode.setAmount(BigDecimal.valueOf(9.9));
-            }
-            list.add(giftExchangeCode);
-        }
-        giftExchangeCodeService.saveBatch(list);
-    }
-
-    @PostMapping("/excode/init2")
-    public void initExcode2(
-            @ApiParam("生成的数量") @RequestParam Integer num
-    ){
-        int count = giftExchangeCodeService.count();
-        if(count > 0){
-            return;
-        }
-        Set<String> codes = new HashSet<>();
-        List<GiftExchangeCode> list = new ArrayList<>();
-        for(int i = 0 ;i < num;i++){
-            String s = RC4Utils.encry_RC4_string(String.format("%04d", 1), UUID.randomUUID().toString());
-            codes.add(s);
-        }
-        for(String s : codes) {
-            GiftExchangeCode giftExchangeCode = new GiftExchangeCode();
-            giftExchangeCode.setId(s);
-            giftExchangeCode.setStatus(0);
-            giftExchangeCode.setType(ExchangeCodeTypeEnum.SUB.toString());
-            giftExchangeCode.setCreateTime(new Date());
-            giftExchangeCode.setAmount(new BigDecimal(9999999));
-            giftExchangeCode.setRemark("金额抵扣");
-            list.add(giftExchangeCode);
-        }
-        giftExchangeCodeService.saveBatch(list);
-    }
-
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/controller/exchange/ExchangeCodeController.java

@@ -1,92 +0,0 @@
-package com.gree.mall.manager.controller.exchange;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.coupon.CouponDetailBean;
-import com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.exchange.ExchangeLogic;
-import com.gree.mall.manager.plus.entity.GiftExchangeCode;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-@RestController
-@Api(value = "兑换码API", tags ={"兑换码API"} )
-@RequestMapping(value = "/exchange/code", produces = "application/json; charset=utf-8")
-public class ExchangeCodeController {
-
-    @Autowired
-    ExchangeLogic exchangeLogic;
-
-    @GetMapping("/count/list")
-    @ApiOperation(value = "统计列表")
-    public ResponseHelper<IPage<GiftExchangeCodeBean>> countList(
-            @ApiParam(value = "昵称/电话",required = false) @RequestParam(required = false) String keyword,
-            @ApiParam(value = "网点主键id",required = false) @RequestParam(required = false) String adminWebsitId,
-            @ApiParam(value = "pageNo",required = false) @RequestParam(required = false) Integer pageNo,
-            @ApiParam(value = "pageSize",required = false) @RequestParam(required = false) Integer pageSize,
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<GiftExchangeCodeBean> giftExchangeCodeBeanIPage = exchangeLogic.queryExchangeCodeCountList(keyword, adminWebsitId, pageNo, pageSize, request);
-        return ResponseHelper.success(giftExchangeCodeBeanIPage);
-    }
-
-    @GetMapping("/count/export")
-    @ApiOperation(value = "统计列表导出")
-    public void exportData(
-            @ApiParam(value = "昵称/电话",required = false) @RequestParam(required = false) String keyword,
-            @ApiParam(value = "网点主键id",required = false) @RequestParam(required = false) String adminWebsitId,
-            HttpServletRequest request,HttpServletResponse response
-    ) throws Exception {
-        IPage<GiftExchangeCodeBean> giftExchangeCodeBeanIPage = exchangeLogic.queryExchangeCodeCountList(keyword, adminWebsitId, 1, -1, request);
-        ExcelData excelData = exchangeLogic.exportCountData(giftExchangeCodeBeanIPage.getRecords());
-        ExcelUtils.exportExcel(request,response,"record.xlsx",excelData);
-    }
-
-
-    @GetMapping("/list")
-    @ApiOperation(value = "列表")
-    public ResponseHelper<IPage<GiftExchangeCode>> list(
-            @ApiParam(value = "id",required = true) @RequestParam(required = true) String id,
-            @ApiParam(value = "用户id",required = true) @RequestParam(required = true) String userId,
-            @ApiParam(value = "订单号",required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "状态 1=已使用 0=未使用",required = false) @RequestParam(required = false) Integer status,
-            @ApiParam(value = "pageNo",required = false) @RequestParam(required = false) Integer pageNo,
-            @ApiParam(value = "pageSize",required = false) @RequestParam(required = false) Integer pageSize,
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<GiftExchangeCode> list = exchangeLogic.list(id,userId, orderId, status, pageNo, pageSize, request);
-        return ResponseHelper.success(list);
-    }
-
-    @GetMapping("/export")
-    @ApiOperation(value = "导出")
-    public void exportData(
-            @ApiParam(value = "id",required = true) @RequestParam(required = true) String id,
-            @ApiParam(value = "用户id",required = true) @RequestParam(required = true) String userId,
-            @ApiParam(value = "订单号",required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "状态 1=已使用 0=未使用",required = false) @RequestParam(required = false) Integer status,
-            HttpServletRequest request,HttpServletResponse response
-    ) throws Exception {
-        IPage<GiftExchangeCode> list = exchangeLogic.list(id,userId, orderId, status, 1, -1, request);
-        ExcelData excelData = exchangeLogic.exportData(list.getRecords());
-        ExcelUtils.exportExcel(request,response,"record.xlsx",excelData);
-    }
-
-
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/logic/exchange/ExchangeLogic.java

@@ -1,124 +0,0 @@
-package com.gree.mall.manager.logic.exchange;
-
-import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.EnterpriseWechatWorkerImportList;
-import com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean;
-import com.gree.mall.manager.commonmapper.CountMapper;
-import com.gree.mall.manager.enums.ExchangeCodeTypeEnum;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.GiftExchangeCode;
-import com.gree.mall.manager.plus.service.GiftExchangeCodeService;
-import com.gree.mall.manager.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@Service
-public class ExchangeLogic {
-
-    @Autowired
-    CountMapper countMapper;
-    @Autowired
-    GiftExchangeCodeService giftExchangeCodeService;
-    @Autowired
-    CommonLogic commonLogic;
-
-    /**
-     * 兑换码统计列表
-     * @param keyword
-     * @param adminWebsitId
-     * @param pageNo
-     * @param pageSize
-     * @param request
-     * @return
-     */
-    public IPage<GiftExchangeCodeBean> queryExchangeCodeCountList(String keyword, String adminWebsitId, Integer pageNo, Integer pageSize, HttpServletRequest request){
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        IPage<GiftExchangeCodeBean> giftExchangeCodeBeanIPage = countMapper
-                .queryExchangeCodeCountList(new Page(pageNo, pageSize), keyword, adminWebsitId, adminUser.getCompanyWechatIds());
-        return giftExchangeCodeBeanIPage;
-    }
-
-    /**
-     * 兑换码列表
-     */
-    public IPage<GiftExchangeCode> list(String id,String userId,String orderId,Integer status, Integer pageNo, Integer pageSize, HttpServletRequest request){
-        IPage<GiftExchangeCode> page = giftExchangeCodeService.lambdaQuery()
-                .eq(GiftExchangeCode::getType, ExchangeCodeTypeEnum.SUB.toString())
-                .eq(StringUtils.isNotBlank(id),GiftExchangeCode::getId,id)
-                .eq(StringUtils.isNotBlank(userId),GiftExchangeCode::getUserId, userId)
-                .eq(StringUtils.isNotBlank(orderId),GiftExchangeCode::getOrderId,orderId)
-                .eq(status != null, GiftExchangeCode::getStatus, status)
-                .page(new Page<>(pageNo, pageSize));
-        return page;
-    }
-
-
-    /**
-     * 兑换码统计导出
-     */
-    public ExcelData exportCountData(List<GiftExchangeCodeBean> list){
-        String[] titles = new String[]{"昵称", "电话", "所属网点", "首次生成时间", "生成数量", "生成总金额", "使用数量"};
-        List<List<Object>> rows = new ArrayList<>();
-        for (GiftExchangeCodeBean bean : list) {
-            List<Object> row = new ArrayList<>();
-            row.add(bean.getNickName());
-            row.add(bean.getUserPhone());
-            row.add(bean.getWebsitName());
-            if(bean.getBindTime() == null){
-                row.add("");
-            }else {
-                row.add(DateUtils.formatDate(bean.getBindTime()));
-            }
-            row.add(bean.getNum());
-            row.add(bean.getTotalAmount());
-            row.add(bean.getUseNum());
-            rows.add(row);
-        }
-        ExcelData excelData = new ExcelData();
-        excelData.setTitles(Arrays.asList(titles));
-        excelData.setRows(rows);
-        return excelData;
-    }
-
-
-    /**
-     * 兑换码导出
-     */
-    public ExcelData exportData(List<GiftExchangeCode> list){
-        String[] titles = new String[]{"优惠码", "生成时间", "金额", "有效期", "状态", "使用时间", "订单编号", "使用人昵称"};
-        List<List<Object>> rows = new ArrayList<>();
-        for (GiftExchangeCode bean : list) {
-            List<Object> row = new ArrayList<>();
-            row.add(bean.getId());
-            if(bean.getBindTime() == null){
-                row.add("");
-            }else {
-                row.add(DateUtils.formatDate(bean.getBindTime()));
-            }
-            row.add(bean.getAmount());
-            if(bean.getEndTime() == null){
-                row.add("");
-            }else {
-                row.add(DateUtils.formatDate(bean.getEndTime()));
-            }
-            row.add(bean.getStatus() == 1?"已使用":"未使用");
-            row.add(bean.getOrderId());
-            row.add(bean.getUseNickName());
-            rows.add(row);
-        }
-        ExcelData excelData = new ExcelData();
-        excelData.setTitles(Arrays.asList(titles));
-        excelData.setRows(rows);
-        return excelData;
-    }
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/logic/goods/GoodsLogic.java

@@ -91,9 +91,9 @@ public class GoodsLogic {
      * @param pageSize
      * @return
      */
-    public IPage<GoodsSpecBean> page(String isTrade,String flag, String keyword, BigDecimal startPrice, BigDecimal endPrice,
+    public IPage<GoodsSpecBean> page(String isTrade, String flag, String keyword, BigDecimal startPrice, BigDecimal endPrice,
                                      BigDecimal startShare, BigDecimal endShare,
-                                     String goodsSortJson, String categoryId, Boolean status,List<String> goodsTypes,
+                                     String goodsSortJson, String categoryId, Boolean status, List<String> goodsTypes,
                                      Integer pageNum, Integer pageSize, HttpServletRequest request) {
 
         //获取当前登录微信企业微信id
@@ -109,13 +109,13 @@ public class GoodsLogic {
         if (StringUtils.isNotBlank(categoryId)) {
             categoryIds.add(categoryId);
         }
-        if(CollectionUtils.isEmpty(goodsTypes)){
+        if (CollectionUtils.isEmpty(goodsTypes)) {
             goodsTypes = new ArrayList<>();
             goodsTypes.add(GoodsTypeEnum.COMMON.toString());
         }
 
-        IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(pageNum, pageSize),isTrade, flag, keyword, startPrice,
-                endPrice, startShare, endShare, sortStr, categoryIds, status, goodsTypes,companyWechatIds);
+        IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(pageNum, pageSize), isTrade, flag, keyword, startPrice,
+                endPrice, startShare, endShare, sortStr, categoryIds, status, goodsTypes, companyWechatIds);
 
         //商品规格
         List<GoodsSpecBean> records = new ArrayList<>();
@@ -123,17 +123,17 @@ public class GoodsLogic {
             String goodsId = goodsSpecBean.getGoodsId();
             List<GoodsSpec> list = goodsSpecService.lambdaQuery().eq(GoodsSpec::getGoodsId, goodsId).list();
             List<GoodsSpecVO> goodsSpecVOS = BeanUtil.copyToList(list, GoodsSpecVO.class);
-            for(GoodsSpecVO goodsSpecVO : goodsSpecVOS){
+            for (GoodsSpecVO goodsSpecVO : goodsSpecVOS) {
                 GoodsMaterial goodsMaterial = goodsMaterialService.getById(goodsSpecVO.getGoodsCode());
 
                 List<GoodsMaterialStorage> goodsMaterialStorages = goodsMaterialStorageService.lambdaQuery().eq(GoodsMaterialStorage::getGoodsMaterialId, goodsSpecVO.getGoodsCode())
                         .list();
-                if(goodsMaterial != null){
+                if (goodsMaterial != null) {
                     goodsSpecVO.setGoodsMaterialName(goodsMaterial.getGoodsName());
 
                     goodsSpecVO.setGoodsMaterialStock(goodsMaterialStorages.stream().map(GoodsMaterialStorage::getStockQty).reduce(Integer::sum).orElse(0));
 
-                    goodsSpecBean.setAllStockNum(goodsSpecBean.getAllStockNum() != null?goodsSpecBean.getAllStockNum()+goodsMaterialStorages.stream().map(GoodsMaterialStorage::getStockQty).reduce(Integer::sum).orElse(0):
+                    goodsSpecBean.setAllStockNum(goodsSpecBean.getAllStockNum() != null ? goodsSpecBean.getAllStockNum() + goodsMaterialStorages.stream().map(GoodsMaterialStorage::getStockQty).reduce(Integer::sum).orElse(0) :
                             goodsMaterialStorages.stream().map(GoodsMaterialStorage::getStockQty).reduce(Integer::sum).orElse(0));
                 }
             }
@@ -147,6 +147,7 @@ public class GoodsLogic {
 
     /**
      * 套购商品列表
+     *
      * @param keyword
      * @param startPrice
      * @param endPrice
@@ -160,10 +161,10 @@ public class GoodsLogic {
      * @param request
      * @return
      */
-    public IPage<GoodsPackageList> packageList( String keyword, BigDecimal startPrice, BigDecimal endPrice,
-                                     BigDecimal startShare, BigDecimal endShare,
-                                     String goodsSortJson, String categoryId, Boolean status,
-                                     Integer pageNum, Integer pageSize, HttpServletRequest request) {
+    public IPage<GoodsPackageList> packageList(String keyword, BigDecimal startPrice, BigDecimal endPrice,
+                                               BigDecimal startShare, BigDecimal endShare,
+                                               String goodsSortJson, String categoryId, Boolean status,
+                                               Integer pageNum, Integer pageSize, HttpServletRequest request) {
 
         //获取当前登录微信企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
@@ -188,6 +189,7 @@ public class GoodsLogic {
 
     /**
      * 根据类型查询商品
+     *
      * @param categoryIds
      * @param request
      * @return
@@ -199,8 +201,8 @@ public class GoodsLogic {
         List<String> companyWechatIds = adminUser.getCompanyWechatIds();
 
 
-        IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(1, -1), null,null, null, null,
-                null, null, null, null, categoryIds, null, null,companyWechatIds);
+        IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(1, -1), null, null, null, null,
+                null, null, null, null, categoryIds, null, null, companyWechatIds);
         //添加规格
         List<GoodsSpecBean> records = goodsSpecBeanIPage.getRecords();
         for (GoodsSpecBean record : records) {
@@ -210,9 +212,9 @@ public class GoodsLogic {
                     .list();
 
             List<GoodsSpecVO> goodsSpecVOS = BeanUtil.copyToList(goodsSpecs, GoodsSpecVO.class);
-            for(GoodsSpecVO goodsSpecVO : goodsSpecVOS){
+            for (GoodsSpecVO goodsSpecVO : goodsSpecVOS) {
                 GoodsMaterial goodsMaterial = goodsMaterialService.getById(goodsSpecVO.getGoodsCode());
-                if(goodsMaterial != null){
+                if (goodsMaterial != null) {
                     goodsSpecVO.setGoodsMaterialName(goodsMaterial.getGoodsName());
                     goodsSpecVO.setGoodsMaterialStock(goodsMaterial.getStockQty());
                     goodsSpecVO.setCostAmount(goodsMaterial.getCostAmount());
@@ -306,6 +308,7 @@ public class GoodsLogic {
 
     /**
      * 商品详情
+     *
      * @param goodsId
      * @return
      */
@@ -317,7 +320,6 @@ public class GoodsLogic {
                 .list();
 
 
-
         //商品库存
         Integer goodsStock = goodsSpecs.stream().collect(Collectors.summingInt(x -> x.getStockNum()));
 
@@ -329,13 +331,13 @@ public class GoodsLogic {
 
 
         List<GoodsSpecVO> goodsSpecVOS = BeanUtil.copyToList(goodsSpecs, GoodsSpecVO.class);
-        for(GoodsSpecVO goodsSpecVO : goodsSpecVOS){
+        for (GoodsSpecVO goodsSpecVO : goodsSpecVOS) {
             GoodsMaterial goodsMaterial = goodsMaterialService.getById(goodsSpecVO.getGoodsCode());
 
             List<GoodsMaterialStorage> goodsMaterialStorages = goodsMaterialStorageService.lambdaQuery().eq(GoodsMaterialStorage::getGoodsMaterialId, goodsSpecVO.getGoodsCode())
                     .list();
 
-            if(goodsMaterial != null){
+            if (goodsMaterial != null) {
                 goodsSpecVO.setGoodsMaterialName(goodsMaterial.getGoodsName());
                 goodsSpecVO.setGoodsMaterialStock(goodsMaterial.getStockQty());
                 goodsSpecVO.setCostAmount(goodsMaterial.getCostAmount());
@@ -359,19 +361,19 @@ public class GoodsLogic {
         }
         //查询商品标签
         List<GoodsTagRela> goodsTagRela = goodsTagRelaService.lambdaQuery().eq(GoodsTagRela::getGoodsId, goodsId)
-                .eq(GoodsTagRela::getType,1).list();
-        if(goodsTagRela.size() > 0){
+                .eq(GoodsTagRela::getType, 1).list();
+        if (goodsTagRela.size() > 0) {
             List<String> tagList = goodsTagRela.stream().map(GoodsTagRela::getGoodsTagName).collect(Collectors.toList());
             goodsBean.setTags(tagList);
         }
 
         List<GoodsTagRela> goodsTagRelas = goodsTagRelaService.lambdaQuery().eq(GoodsTagRela::getGoodsId, goodsId)
-                .eq(GoodsTagRela::getType,2).list();
-        if(goodsTagRelas.size() > 0){
+                .eq(GoodsTagRela::getType, 2).list();
+        if (goodsTagRelas.size() > 0) {
             List<String> tagList = goodsTagRelas.stream().map(GoodsTagRela::getGoodsTagName).collect(Collectors.toList());
             goodsBean.setTagsLabel(tagList);
         }
-        if(StringUtils.equals(goodsBean.getGoodsType(),GoodsTypeEnum.PACKAGE.toString())) {
+        if (StringUtils.equals(goodsBean.getGoodsType(), GoodsTypeEnum.PACKAGE.toString())) {
             //套购商品--指定人员列表
             goodsBean.setUsers(this.getPackageUseUserList(goodsBean.getGoodsId(), null));
         }
@@ -382,26 +384,26 @@ public class GoodsLogic {
     /**
      * 套购商品-商品配置列表
      */
-    public List<GoodsPackageBean> popList(String goodsId,Integer type){
+    public List<GoodsPackageBean> popList(String goodsId, Integer type) {
         //套购商品
         Goods goods = goodsService.getById(goodsId);
-        if(!StringUtils.equals(goods.getGoodsType(),GoodsTypeEnum.PACKAGE.toString())){
+        if (!StringUtils.equals(goods.getGoodsType(), GoodsTypeEnum.PACKAGE.toString())) {
             throw new RemoteServiceException("非套餐商品");
         }
 
         //套购商品--商品配置
         List<GoodsPackagePop> list = goodsPackagePopService.lambdaQuery()
                 .eq(GoodsPackagePop::getGoodsPackageId, goodsId)
-                .eq(GoodsPackagePop::getType,type).list();
+                .eq(GoodsPackagePop::getType, type).list();
 
-        Map<String,List<GoodsPackagePopBean>> map = new LinkedHashMap<>();
+        Map<String, List<GoodsPackagePopBean>> map = new LinkedHashMap<>();
         for (GoodsPackagePop bean : list) {
             List<GoodsPackagePopBean> goodsPackagePops = map.get(bean.getGoodsId());
-            if(goodsPackagePops == null){
+            if (goodsPackagePops == null) {
                 goodsPackagePops = new ArrayList<>();
             }
             GoodsPackagePopBean newBean = new GoodsPackagePopBean();
-            BeanUtils.copyProperties(bean,newBean);
+            BeanUtils.copyProperties(bean, newBean);
 
             GoodsSpec goodsSpec = goodsSpecService.getById(bean.getGoodsSpecId());
             newBean.setSpecName(goodsSpec.getName());
@@ -409,11 +411,11 @@ public class GoodsLogic {
             newBean.setStock(goodsSpec.getStockNum());
 
             goodsPackagePops.add(newBean);
-            map.put(bean.getGoodsId(),goodsPackagePops);
+            map.put(bean.getGoodsId(), goodsPackagePops);
         }
         //商品
         List<GoodsPackageBean> goodsList = new ArrayList<>();
-        for(String gdsId : map.keySet()){
+        for (String gdsId : map.keySet()) {
 
             Goods nGoods = goodsService.getById(gdsId);
 
@@ -425,11 +427,10 @@ public class GoodsLogic {
             bean.setSortNum(goodsPackagePop.getSortNum());
             goodsList.add(bean);
         }
-      return goodsList;
+        return goodsList;
     }
 
 
-
     /**
      * 添加商品
      *
@@ -437,22 +438,25 @@ public class GoodsLogic {
      */
     @Transactional(rollbackFor = Exception.class)
     public void add(GoodsBean goodsBean, HttpServletRequest request) throws RemoteServiceException {
-        if (StringUtils.equals(goodsBean.getGoodsType(),GoodsTypeEnum.COMMON.toString())
+        if (StringUtils.equals(goodsBean.getGoodsType(), GoodsTypeEnum.COMMON.toString())
                 && (goodsBean.getGoodsSpecs() == null || goodsBean.getGoodsSpecs().size() == 0)) {
             //如果是规格没有抛出异常
             throw new RemoteServiceException("至少要有一个规格!");
         }
         //设置企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
+//        if (StringUtils.isBlank(goodsBean.getCompanyWechatId())) {
+//            throw new RemoteServiceException("请选择商户信息");
+//        }
         if (StringUtils.isBlank(adminUser.getCompanyWechatId())) {
-            throw new RemoteServiceException("非租户账号不可操作当前信息");
+            throw new RemoteServiceException("非商户账号不可操作当前信息");
         }
         goodsBean.setCompanyWechatId(adminUser.getCompanyWechatId());
         goodsBean.setCompanyName(adminUser.getCompanyName());
 
         Date creatDate = new Date();
         List<GoodsSpec> goodsSpecList = goodsBean.getGoodsSpecs();
-        if(CollectionUtils.isNotEmpty(goodsSpecList)) {
+        if (CollectionUtils.isNotEmpty(goodsSpecList)) {
             Collections.sort(goodsSpecList, (o1, o2) -> o1.getPrice().compareTo(o2.getPrice()));
             goodsBean.setGoodsPrice(goodsSpecList.get(0).getPrice());
             goodsBean.setOrgGoodsPrice(goodsSpecList.get(0).getOrgPrice());
@@ -460,13 +464,13 @@ public class GoodsLogic {
         goodsBean.setCreateTime(creatDate);
         goodsService.save(goodsBean);
 
-        if(CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
+        if (CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
 
             List<GoodsSpec> goodsSpecs = goodsBean.getGoodsSpecs();
-            for(GoodsSpec goodsSpec:goodsSpecs){
+            for (GoodsSpec goodsSpec : goodsSpecs) {
 
                 GoodsMaterial goodsMaterial = goodsMaterialService.getById(goodsSpec.getGoodsCode());
-                if(goodsMaterial != null){
+                if (goodsMaterial != null) {
                     goodsSpec.setSpecValue(goodsMaterial.getSpecsName());
                 }
 
@@ -499,7 +503,7 @@ public class GoodsLogic {
         //查询物料信息
         fucaiLogic.getWuliao(goodsSpecList);
         //批量保存商品规格
-        if(CollectionUtils.isNotEmpty(goodsSpecList))
+        if (CollectionUtils.isNotEmpty(goodsSpecList))
             goodsSpecService.saveBatch(goodsSpecList);
 
         //保存轮播图
@@ -508,8 +512,8 @@ public class GoodsLogic {
             commonLogic.bindFile(goodsBean.getGoodsId(), Constant.Img.GOODS_IMG, imageIdList);
         }
         //save tags
-        this.saveGoodsTagRela(goodsBean.getTags(),goodsBean.getGoodsId(),1);
-        this.saveGoodsTagRela(goodsBean.getTagsLabel(),goodsBean.getGoodsId(),2);
+        this.saveGoodsTagRela(goodsBean.getTags(), goodsBean.getGoodsId(), 1);
+        this.saveGoodsTagRela(goodsBean.getTagsLabel(), goodsBean.getGoodsId(), 2);
 
         //套购商品处理
         //this.saveGoodsPackage(goodsBean);
@@ -518,15 +522,15 @@ public class GoodsLogic {
     /**
      * 保存标签
      */
-    public void saveGoodsTagRela(List<String> tags,String goodsId,Integer type){
+    public void saveGoodsTagRela(List<String> tags, String goodsId, Integer type) {
 
-        if(CollectionUtils.isEmpty(tags)){
-            goodsTagRelaService.lambdaUpdate().eq(GoodsTagRela::getGoodsId,goodsId).eq(GoodsTagRela::getType,type).remove();
+        if (CollectionUtils.isEmpty(tags)) {
+            goodsTagRelaService.lambdaUpdate().eq(GoodsTagRela::getGoodsId, goodsId).eq(GoodsTagRela::getType, type).remove();
             return;
         }
         //先删后加
-        goodsTagRelaService.lambdaUpdate().eq(GoodsTagRela::getGoodsId,goodsId).eq(GoodsTagRela::getType,type).remove();
-        for(String tag:tags){
+        goodsTagRelaService.lambdaUpdate().eq(GoodsTagRela::getGoodsId, goodsId).eq(GoodsTagRela::getType, type).remove();
+        for (String tag : tags) {
             GoodsTagRela goodsTagRela = new GoodsTagRela();
             goodsTagRela.setGoodsTagName(tag);
             goodsTagRela.setCreateTime(new Date());
@@ -539,16 +543,17 @@ public class GoodsLogic {
 
 
     /**
-     *  限制最大分账
+     * 限制最大分账
+     *
      * @param price
      * @param shareAmount
      * @return
      */
     private BigDecimal limitShareAmount(BigDecimal price, BigDecimal shareAmount) {
-        if(price == null){
+        if (price == null) {
             throw new RemoteServiceException("销售价不能为空");
         }
-        if(shareAmount == null){
+        if (shareAmount == null) {
             throw new RemoteServiceException("佣金或分销金额不能为空");
         }
         return shareAmount;
@@ -588,7 +593,7 @@ public class GoodsLogic {
     public void update(GoodsBean goodsBean, HttpServletRequest request) throws RemoteServiceException {
 
         //检查是否存在秒杀活动
-        if (StringUtils.equals(goodsBean.getGoodsType(),GoodsTypeEnum.COMMON.toString())
+        if (StringUtils.equals(goodsBean.getGoodsType(), GoodsTypeEnum.COMMON.toString())
                 && (goodsBean.getGoodsSpecs() == null || goodsBean.getGoodsSpecs().size() == 0)) {
             throw new RemoteServiceException("至少要有一个规格!");
         }
@@ -602,10 +607,9 @@ public class GoodsLogic {
         goodsBean.setCompanyName(adminUser.getCompanyName());
 
 
-
         List<GoodsSpec> notRemoveList = new ArrayList<>();
         //查找未删除的规格
-        if(CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
+        if (CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
             notRemoveList = goodsBean.getGoodsSpecs().stream()
                     .filter(goodsSpec -> StringUtils.isNotBlank(goodsSpec.getGoodsSpecId()))
                     .map(goodsSpec -> goodsSpec.setGoodsId(goodsBean.getGoodsId())
@@ -624,7 +628,7 @@ public class GoodsLogic {
 
             //更新主表信息
             List<GoodsSpec> goodsSpecList = goodsBean.getGoodsSpecs();
-            if(CollectionUtils.isNotEmpty(goodsSpecList)) {
+            if (CollectionUtils.isNotEmpty(goodsSpecList)) {
                 Collections.sort(goodsSpecList, (o1, o2) -> o1.getPrice().compareTo(o2.getPrice()));
                 goodsBean.setGoodsPrice(goodsSpecList.get(0).getPrice());
                 goodsBean.setOrgGoodsPrice(goodsSpecList.get(0).getOrgPrice());
@@ -654,13 +658,13 @@ public class GoodsLogic {
             goodsSpecService.updateBatchById(notRemoveList);
         }
         //查找规格id为空的 添加到从表
-        if(CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
+        if (CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
 
             List<GoodsSpec> addGoodsSpecList = goodsBean.getGoodsSpecs();
-            for(GoodsSpec goodsSpec:addGoodsSpecList){
+            for (GoodsSpec goodsSpec : addGoodsSpecList) {
 
                 GoodsMaterial goodsMaterial = goodsMaterialService.getById(goodsSpec.getGoodsCode());
-                if(goodsMaterial != null){
+                if (goodsMaterial != null) {
                     goodsSpec.setSpecValue(goodsMaterial.getSpecsName());
                 }
 
@@ -682,8 +686,8 @@ public class GoodsLogic {
             }
         }
         //save tags
-        this.saveGoodsTagRela(goodsBean.getTags(),goodsBean.getGoodsId(),1);
-        this.saveGoodsTagRela(goodsBean.getTagsLabel(),goodsBean.getGoodsId(),2);
+        this.saveGoodsTagRela(goodsBean.getTags(), goodsBean.getGoodsId(), 1);
+        this.saveGoodsTagRela(goodsBean.getTagsLabel(), goodsBean.getGoodsId(), 2);
 
         //套购商品处理
         //this.saveGoodsPackage(goodsBean);
@@ -783,6 +787,7 @@ public class GoodsLogic {
 
     /**
      * 商品上下架
+     *
      * @param goodsIdList
      * @param action
      */
@@ -798,6 +803,7 @@ public class GoodsLogic {
 
     /**
      * 商品模板
+     *
      * @param goodsTemplateBean
      * @param request
      */
@@ -905,9 +911,9 @@ public class GoodsLogic {
     /**
      * 用 商品规格的 分销金额 覆盖其 为null的 内部分销金额
      */
-    public void syncGoodsSpecInnerShareMsg(HttpServletRequest request){
+    public void syncGoodsSpecInnerShareMsg(HttpServletRequest request) {
         String companyWechatId = commonLogic.getAdminUser(request).getCompanyWechatId();
-        if(StringUtils.isBlank(companyWechatId)){
+        if (StringUtils.isBlank(companyWechatId)) {
             throw new RemoteServiceException("运营账号暂无权限操作");
         }
 
@@ -919,23 +925,23 @@ public class GoodsLogic {
     /**
      * 修改商品水印和有效时间
      */
-    public void updateGoodsLogo(List<String> goodsIds,String logo,String logoStartTime,String logoEndTime) throws ParseException {
+    public void updateGoodsLogo(List<String> goodsIds, String logo, String logoStartTime, String logoEndTime) throws ParseException {
         goodsService.lambdaUpdate()
-                .set(Goods::getLogo,logo)
-                .set(Goods::getLogoStartTime,DateUtils.parseDate(logoStartTime))
-                .set(Goods::getLogoEndTime,DateUtils.parseDate(logoEndTime))
-                .in(Goods::getGoodsId,goodsIds)
+                .set(Goods::getLogo, logo)
+                .set(Goods::getLogoStartTime, DateUtils.parseDate(logoStartTime))
+                .set(Goods::getLogoEndTime, DateUtils.parseDate(logoEndTime))
+                .in(Goods::getGoodsId, goodsIds)
                 .update();
     }
 
     /**
-     *  套购商品指定人员列表
+     * 套购商品指定人员列表
      */
-    public List<User> getPackageUseUserList(String goodsId,String mobile){
+    public List<User> getPackageUseUserList(String goodsId, String mobile) {
         List<GoodsPackageUserRela> list = goodsPackageUserRelaService.lambdaQuery()
                 .eq(GoodsPackageUserRela::getGoodsId, goodsId)
                 .like(StringUtils.isNotBlank(mobile), GoodsPackageUserRela::getMobile, mobile).list();
-        if(CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isEmpty(list)) {
             return new ArrayList<>();
         }
         List<String> userIds = list.stream().map(GoodsPackageUserRela::getUserId).collect(Collectors.toList());
@@ -946,32 +952,32 @@ public class GoodsLogic {
     /**
      * 套购商品-导入指定人员
      */
-    public List<User> importPackageUser(List<Object> list){
-        if(CollectionUtils.isEmpty(list)){
+    public List<User> importPackageUser(List<Object> list) {
+        if (CollectionUtils.isEmpty(list)) {
             return new ArrayList<>();
         }
         List<String> mobiles = new ArrayList<>();
-        for(Object o : list){
+        for (Object o : list) {
             List<Object> row = (List<Object>) o;
-            mobiles.add((String)row.get(1));
+            mobiles.add((String) row.get(1));
         }
         List<User> users = userLogic.getByMobile(mobiles);
         return users;
     }
 
-    public List<Goods> getById(List<String> goodsIds){
+    public List<Goods> getById(List<String> goodsIds) {
         List<Goods> goodsList = goodsService.lambdaQuery().in(Goods::getGoodsId, goodsIds).list();
         return goodsList;
     }
 
-    public List<GoodsSpec> getSpec(List<String> goodsIds){
+    public List<GoodsSpec> getSpec(List<String> goodsIds) {
         List<GoodsSpec> goodsSpecs = goodsSpecService.lambdaQuery().in(GoodsSpec::getGoodsId, goodsIds).list();
         return goodsSpecs;
     }
 
     public void batchUp(List<String> goodsIds, String isTrade) {
         goodsService.lambdaUpdate()
-                .in(Goods::getGoodsId,goodsIds)
-                .set(Goods::getIsTrade,isTrade).update();
+                .in(Goods::getGoodsId, goodsIds)
+                .set(Goods::getIsTrade, isTrade).update();
     }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/goods/JxGoodsLogic.java

@@ -1100,16 +1100,12 @@ public class JxGoodsLogic {
             goodsSaleLedger.setCompanyWechatName(orderInfo.getCompanyWechatName());
             goodsSaleLedger.setGoodsMaterialId(goodsMaterial.getId());
             goodsSaleLedger.setGoodsMaterialName(goodsMaterial.getGoodsName());
-            goodsSaleLedger.setWorkerId(orderInfo.getWorkerId());
-            goodsSaleLedger.setWorkerName(orderInfo.getWorkerName());
-            goodsSaleLedger.setWorkerPhone(orderInfo.getWorkerPhone());
             goodsSaleLedger.setCostPrice(goodsMaterial.getCostAmount());
             goodsSaleLedger.setOrderDetailId(orderDetail.getOrderDetailId());
             goodsSaleLedger.setFreight(orderInfo.getFreight());
             goodsSaleLedger.setQty(orderDetail.getNum());
             goodsSaleLedger.setSaleTime(orderInfo.getPayTime());
             goodsSaleLedger.setSaleAmount(orderDetail.getTotalPrice());
-            goodsSaleLedger.setCommisAmount(orderDetail.getShareAmount());
             goodsSaleLedger.setRecePhone(orderInfo.getRecePhone());
             goodsSaleLedger.setReceUserName(orderInfo.getReceUserName());
             goodsSaleLedger.setSendGoodsTime(new Date());

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderDeliveryLogic.java

@@ -242,9 +242,6 @@ public class OrderDeliveryLogic {
         orderInfo.setDeliverTime(new Date());
         orderInfo.setWorkOrder(deliverGoodsBean.getSend());
         orderInfo.setExchangeOrder(deliverGoodsBean.getExchangeOrder());
-        orderInfo.setPickName(deliverGoodsBean.getPickName());
-        orderInfo.setPickPhone(deliverGoodsBean.getPickPhone());
-        orderInfo.setPickType(deliverGoodsBean.getPickType());
         orderInfo.updateById();
 
         if (isOver) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -173,14 +173,11 @@ public class OrderLogic {
                 .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),OrderInfo::getCompanyWechatId,adminUser.getCompanyWechatIds())
                 ////.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),OrderInfo::getWebsitId,adminUser.getAdminWebsitIds())
                 .eq(StringUtils.isNotBlank(userId), OrderInfo::getUserId, userId)
-                .eq(StringUtils.isNotBlank(goodsId),OrderInfo::getPromotionPackageGoodsId,goodsId)
-                .like(StringUtils.isNotBlank(exchangeCode),OrderInfo::getExchangeCode,exchangeCode)
                 .like(StringUtils.isNotBlank(orderId), OrderInfo::getOrderId, orderId)
                 .like(StringUtils.isNotBlank(productName), OrderInfo::getOrderTitle, productName)
                 .in(CollectionUtils.isNotEmpty(orderIds),OrderInfo::getOrderId,orderIds)
-                .eq(StringUtils.isNotBlank(websitId),OrderInfo::getWebsitId,websitId)
                 .and(StringUtils.isNotBlank(userName), v -> v.like(OrderInfo::getUserName,userName).or().like(OrderInfo::getReceUserName,userName))
-                .and(StringUtils.isNotBlank(phone), v -> v.like(OrderInfo::getPhone, phone).or().like(OrderInfo::getRecePhone,phone).or().like(OrderInfo::getWorkerPhone,phone))
+                .and(StringUtils.isNotBlank(phone), v -> v.like(OrderInfo::getPhone, phone).or().like(OrderInfo::getRecePhone,phone))
           //      .in(!(adminWebsitBean.getType() && org.apache.commons.lang3.StringUtils.isBlank(websitId)), OrderInfo::getWebsitNumber, websitNoList)
                 .in(CollectionUtils.isNotEmpty(orderStatus), OrderInfo::getOrderStatus, orderStatus)
                 .between(StringUtils.isNotBlank(startCreateTime) && StringUtils.isNotBlank(endCreateTime), OrderInfo::getCreateTime, startCreateTime, endCreateTime + " 23:59:59")
@@ -370,8 +367,6 @@ public class OrderLogic {
         }
         OrderDetail orderDetail = orderDetailService.getById(orderDetailId);
         OrderInfo orderInfo = orderInfoService.getById(orderDetail.getOrderId());
-        //1=非团购商品  2=团购商品
-        int flag = StringUtils.isNotBlank(orderDetail.getPromotionGroupId()) ? 2 : 1;
 
         String orderId = orderDetail.getOrderId();
 
@@ -388,9 +383,6 @@ public class OrderLogic {
         }
         //退款的数量占比
         double div = ArithUtils.div(num, orderDetail.getNum(), 4);
-        double mul = ArithUtils.mul(orderDetail.getShareAmount().doubleValue(), div, 2);
-        //退款的金额
-        BigDecimal totalShareAmount = BigDecimal.valueOf(mul);
         //计算需要退款的金额
         BigDecimal refundAmount = BigDecimal.valueOf(ArithUtils.mul(orderDetail.getPayAmount().doubleValue(), div, 2));
 
@@ -428,7 +420,6 @@ public class OrderLogic {
                 UserCoupon userCoupon = userCouponService.getById(orderInfo.getUserCouponId());
                 if (userCoupon.getSelfUse() != null && userCoupon.getSelfUse()) {
                     //todo sql处理,数量加一,删除指定记录
-                    //coustomUserCouponMapper.increaseLeftTimes(userCoupon.getTransferor());
                     userCouponService.removeById(userCouponId);
                 }else{
                     userCouponService.lambdaUpdate()
@@ -444,8 +435,7 @@ public class OrderLogic {
                     .set(OrderInfo::getRefundFlag, RefundFlagEnum.PARTLY.toString())
                     .update();
         }
-        log.info("【退款开始：】重置flag={}的结算金额，需要减掉的金额{}", flag,totalShareAmount.doubleValue());
-        orderShareLogic.reloadAmount(orderId, totalShareAmount,flag);
+
         log.info("【退款开始：】退款金额{}", refundAmount);
 
         return refundAmount;
@@ -493,9 +483,6 @@ public class OrderLogic {
 
         //退款的数量占比
         double div = ArithUtils.div(num, orderDetail.getNum(), 4);
-        double mul = ArithUtils.mul(orderDetail.getShareAmount().doubleValue(), div, 2);
-        //退款的金额
-        BigDecimal totalShareAmount = BigDecimal.valueOf(mul);
         //计算需要退款的金额
         orderDetail.setRefundNum(orderDetail.getRefundNum() + num);
         orderDetail.setRefundAmount(orderDetail.getRefundAmount().add(refundAmount));
@@ -555,12 +542,7 @@ public class OrderLogic {
                     .update();
         }
 
-        //1=非团购商品 2=团购商品
-        if(totalShareAmount.doubleValue() > 0) {
-            int flag = StringUtils.isNotBlank(orderDetail.getPromotionGroupId()) ? 2 : 1;
-            log.info("【退款开始：】重置结算,order_id={},flag={}金额，需要减掉的金额{}", orderInfo.getOrderId(),flag, totalShareAmount.doubleValue());
-            orderShareLogic.reloadAmount(orderId, totalShareAmount, flag);
-        }
+
         log.info("【退款开始：】退款金额{},order_id={}", refundAmount,orderInfo.getOrderId());
 
         return refundAmount;
@@ -728,9 +710,6 @@ public class OrderLogic {
         orderInfo.setDeliverTime(new Date());
         orderInfo.setWorkOrder(deliverGoodsBean.getSend());
         orderInfo.setExchangeOrder(deliverGoodsBean.getExchangeOrder());
-        orderInfo.setPickName(deliverGoodsBean.getPickName());
-        orderInfo.setPickPhone(deliverGoodsBean.getPickPhone());
-        orderInfo.setPickType(deliverGoodsBean.getPickType());
         orderInfo.updateById();
 
         orderShareLogic.updateOrderStatus(orderId, OrderStatusEnum.YFH.toString());
@@ -796,7 +775,6 @@ public class OrderLogic {
             for (OrderDetail orderDetail : orderDetails) {
                 String factoryNo = stringMap.get(orderDetail.getGoodsMaterialId());
                 if (StringUtils.isNotBlank(factoryNo)) {
-                    orderDetail.setGoodsMaterialName(orderDetail.getGoodsMaterialName() + "(" + factoryNo + ")");
                     orderDetail.setGoodsName(orderDetail.getGoodsName() + "(" + factoryNo + ")");
                 }
                 OrderDetailSon orderDetailSon = BeanUtil.toBean(orderDetail, OrderDetailSon.class);
@@ -825,14 +803,7 @@ public class OrderLogic {
             refundFlag = true;
         }
         orderDetailBean.setRefundAble(refundFlag);
-        //团长信息
-        if(StringUtils.isNotBlank(orderInfo.getPromotionGroupUserId())){
-            User user = userService.getById(orderInfo.getPromotionGroupUserId());
-            if(user != null){
-                orderDetailBean.setPromotionGroupUserName(user.getNickName());
-                orderDetailBean.setPromotionGroupMobile(user.getMobile());
-            }
-        }
+
         //查询订单评价
         orderDetailBean.setOrderComment(commentTagLogic.getOrderComment(orderId));
         orderDetailBean.setOrderCommentTags(commentTagLogic.getCommentTags(orderId));
@@ -921,7 +892,7 @@ public class OrderLogic {
 
             User user = null;
             //查询团长
-            String promotionGroupUserId = orderDetailBean.getPromotionGroupUserId();
+            String promotionGroupUserId = null;
             if(StringUtils.isNotBlank(promotionGroupUserId)){
                 user = userService.getById(promotionGroupUserId);
             }
@@ -976,13 +947,8 @@ public class OrderLogic {
                 row.add(orderDetailBean.getRemark());
                 row.add(simpleDateFormat.format(orderDetailBean.getCreateTime()));
                 row.add(orderDetailBean.getUserName());
-                row.add(orderDetailBean.getWorkerName());
                 row.add(orderDetailBean.getBuyerMsg());
                 row.add(orderDetailBean.getRemark());
-                row.add(orderDetailBean.getWebsitName());
-                row.add(trimStr(orderDetailBean.getWorkerName(), "\r\n", orderDetailBean.getWebsitName()));
-                row.add(orderDetail.getShareAmount());
-                row.add(orderDetailBean.getPromotionGroupUserId());
                 if(user != null) {
                     row.add(user.getNickName());
                     row.add(user.getMobile());
@@ -1130,7 +1096,6 @@ public class OrderLogic {
                         bean.setSmallName(goodsCategory.getSmallName());
                     }
                 }
-                bean.setProductName(orderDetail.getGoodsMaterialSpecsName());
                 bean.setNum(orderDetail.getNum() - orderDetail.getRefundNum());
                 pgOrderProductList.add(bean);
             }
@@ -1151,60 +1116,6 @@ public class OrderLogic {
             List<String> orderDetailIds = orderDetailList.stream().map(OrderDetail::getOrderDetailId).collect(Collectors.toList());
             orderDetailService.lambdaUpdate().set(OrderDetail::getWorkerOrderNo,orderBaseId).in(OrderDetail::getOrderDetailId,orderDetailIds).update();
 
-            //以旧换新的订单，生成拆机单
-            if(orderInfo.getYjhxDkFlag() != null && orderInfo.getYjhxDkFlag() != 0){
-                OrderOldProduct orderOldProduct = orderOldProductService.lambdaQuery()
-                        .eq(OrderOldProduct::getOrderId, orderInfo.getOrderId())
-                        .last("limit 1").one();
-                if(orderOldProduct == null){
-                    return;
-                }
-                //以旧换新拆机属性
-                List<OrderOldProductItem> oldProductItems = orderOldProductItemService.lambdaQuery().eq(OrderOldProductItem::getOrderOldProductId, orderOldProduct.getId()).list();
-                String cjRemark = "";
-                if(CollectionUtils.isNotEmpty(oldProductItems)) {
-                    cjRemark = "以旧换新：";
-                    for (OrderOldProductItem item : oldProductItems) {
-                        cjRemark += item.getDictName() + "(" + item.getPrice() + "),";
-                    }
-                }
-                if(StringUtils.isNotBlank(cjRemark)){
-                    cjRemark = cjRemark.substring(0,cjRemark.length() - 1);
-                }
-
-                OrderAddBean2DTO bean2DTO = new OrderAddBean2DTO();
-                bean2DTO.setUserAddressId(orderInfo.getUserAddressId());
-                //bean2DTO.setOrderSmallType(orderSmallType);
-                //bean2DTO.setOrderProducts(pgOrderProductList);
-                bean2DTO.setRemark(orderInfo.getRemark());
-                bean2DTO.setCompanyWechatId(orderInfo.getCompanyWechatId());
-                bean2DTO.setCompanyWechatName(orderInfo.getCompanyWechatName());
-                bean2DTO.setSaleOrderId(orderInfo.getOrderId());
-                bean2DTO.setUserName(orderInfo.getReceUserName());
-                bean2DTO.setPhone(orderInfo.getRecePhone());
-                bean2DTO.setAddress(orderInfo.getProvince()+orderInfo.getCity()+orderInfo.getArea()+orderInfo.getStreet()+orderInfo.getReceAddress());
-                //拆机的产品信息
-                if(orderOldProduct.getNum() - orderOldProduct.getRefundNum() <= 0){
-                    continue;
-                }
-                List<PgOrderProduct> pgOrderProducts2 = new ArrayList<>();
-                PgOrderProduct bean = new PgOrderProduct();
-                bean.setBrandId("");
-                bean.setBrandName("");
-                bean.setImgUrl(orderOldProduct.getMainImg());
-                bean.setMainId(orderOldProduct.getMainId());
-                bean.setMainName(orderOldProduct.getMainName());
-                bean.setSmallId(orderOldProduct.getSmallId());
-                bean.setSmallName(orderOldProduct.getSmallName());
-                bean.setProductName(orderOldProduct.getSpecName());
-                bean.setNum(orderOldProduct.getNum() - orderOldProduct.getRefundNum());
-                pgOrderProducts2.add(bean);
-                bean2DTO.setOrderProducts(pgOrderProducts2);
-                bean2DTO.setIsCj(true);
-                bean2DTO.setRemark(cjRemark);
-                orderBaseLogic.add(bean2DTO);
-            }
-
         }
 
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderOfflineLogic.java

@@ -38,6 +38,7 @@ import java.util.List;
 
 /**
  * 线下销售订单
+ *
  * @author ：lijh
  * @description：TODO
  * @date ：2024/2/2 16:31
@@ -55,103 +56,98 @@ public class OrderOfflineLogic {
     private final GoodsCategoryService goodsCategoryService;
     private final GoodsService goodsService;
     private final GoodsSpecService goodsSpecService;
-    private final GoodsCategoryItemService goodsCategoryItemService;
     private final OrderOldProductService orderOldProductService;
     private final OrderOldProductItemService orderOldProductItemService;
     private final GoodsMaterialStorageService goodsMaterialStorageService;
+
     /**
      * 线下销售单列表
+     *
      * @param zfireParamBean
      * @return
      */
-    public IPage<OrderInfoVO> list(ZfireParamBean zfireParamBean){
+    public IPage<OrderInfoVO> list(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        zfireParamBean = FieldUtils.supplyParam(zfireParamBean,OrderInfoVO.class,adminUser);
+        zfireParamBean = FieldUtils.supplyParam(zfireParamBean, OrderInfoVO.class, adminUser);
         IPage<OrderInfoVO> orderInfoVOIPage = commonMapper.queryOrderInfoList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
         return orderInfoVOIPage;
     }
 
     /**
      * 添加/编辑线下单
+     *
      * @param orderInfoAddBean
      */
     @Transactional
-    public String addOfflineOrder(OrderInfoAddBean orderInfoAddBean){
+    public String addOfflineOrder(OrderInfoAddBean orderInfoAddBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         OrderInfo orderInfo = null;
-        if(StringUtils.isNotBlank(orderInfoAddBean.getOrderId())){
+        if (StringUtils.isNotBlank(orderInfoAddBean.getOrderId())) {
             orderInfo = orderInfoService.getById(orderInfoAddBean.getOrderId());
-            if(orderInfo == null){
+            if (orderInfo == null) {
                 throw new RemoteServiceException("订单不存在");
             }
-            if(!orderInfo.getOrderStatus().equals(OrderStatusEnum.NOPAY.toString())){
+            if (!orderInfo.getOrderStatus().equals(OrderStatusEnum.NOPAY.toString())) {
                 throw new RemoteServiceException("已支付订单不可编辑");
             }
-            if(orderInfo.getOrderStatus().equals(OrderStatusEnum.TIMEOUT.toString())){
+            if (orderInfo.getOrderStatus().equals(OrderStatusEnum.TIMEOUT.toString())) {
                 throw new RemoteServiceException("订单已超时取消，请重新下单");
             }
         }
-        if(orderInfo == null){
+        if (orderInfo == null) {
             orderInfo = new OrderInfo();
         }
-        BeanUtil.copyProperties(orderInfoAddBean,orderInfo,"orderId");
-        if(StringUtils.isBlank(orderInfo.getOrderId())){
-            orderInfo.setOrderId("N"+IdWorker.getIdStr());
+        BeanUtil.copyProperties(orderInfoAddBean, orderInfo, "orderId");
+        if (StringUtils.isBlank(orderInfo.getOrderId())) {
+            orderInfo.setOrderId("N" + IdWorker.getIdStr());
         }
         orderInfo.setCompanyWechatId(adminUser.getCompanyWechatId());
         orderInfo.setCompanyName(adminUser.getCompanyName());
-        orderInfo.setIsOld(orderInfoAddBean.getIsOld());
 
         Integer totalNum = 0;
         BigDecimal totalPrice = BigDecimal.ZERO;
         String orderTitle = "";
         List<OrderDetail> orderDetails = orderInfoAddBean.getOrderDetails();
-        if(CollectionUtils.isEmpty(orderDetails)){
+        if (CollectionUtils.isEmpty(orderDetails)) {
             throw new RemoteServiceException("请选择商品信息");
         }
-        for(OrderDetail orderDetail : orderDetails){
-
-
-            if(orderDetail.getPrice() == null){
+        for (OrderDetail orderDetail : orderDetails) {
+            if (orderDetail.getPrice() == null) {
                 throw new RemoteServiceException("单价不能为空");
             }
-            if(orderDetail.getNum() == null){
+            if (orderDetail.getNum() == null) {
                 throw new RemoteServiceException("购买数量不能为空");
             }
-            if(orderDetail.getNum() <= 0){
+            if (orderDetail.getNum() <= 0) {
                 throw new RemoteServiceException("购买数量必须大于0");
             }
 
-            if(orderDetail.getNum() == 0 && orderInfoAddBean.getIsOld().equals(IsYesNoEnum.YES.getKey())){
-                throw new RemoteServiceException("以旧换新，购买数量必须等于0");
-            }
-
             //物料
-            if(orderDetail.getFlag() == 2) {
-                if(StringUtils.isBlank(orderDetail.getGoodsMaterialId())){
+            if (orderDetail.getFlag() == 2) {
+                if (StringUtils.isBlank(orderDetail.getGoodsMaterialId())) {
                     throw new RemoteServiceException("请选择规格型号");
                 }
                 GoodsMaterial gm = goodsMaterialService.getById(orderDetail.getGoodsMaterialId());
                 if (gm == null) {
                     throw new RemoteServiceException("物料id有误，请检查");
                 }
-                orderDetail = supplyOrderDetail(orderInfo.getOrderId(),gm,orderDetail);
+                orderDetail = supplyOrderDetail(orderInfo.getOrderId(), gm, orderDetail);
                 orderTitle += gm.getGoodsName() + ",";
 
-            }else{
+            } else {
                 //商品规格
                 Boolean isGm = false;
                 GoodsSpec goodsSpec = goodsSpecService.getById(orderDetail.getGoodsSpecId());
 
-                if(StringUtils.isNotBlank(goodsSpec.getGoodsCode())){
+                if (StringUtils.isNotBlank(goodsSpec.getGoodsCode())) {
                     GoodsMaterial gm = goodsMaterialService.getById(orderDetail.getGoodsMaterialId());
-                    if(gm != null) {
+                    if (gm != null) {
                         orderDetail = supplyOrderDetail(orderInfo.getOrderId(), gm, orderDetail);
                         isGm = true;
                     }
                 }
-                if(!isGm){
+                if (!isGm) {
                     Goods goods = goodsService.getById(goodsSpec.getGoodsId());
                     orderDetail.setOrderId(orderInfo.getOrderId());
                     orderDetail.setBrandId(goods.getBrandId());
@@ -172,8 +168,6 @@ public class OrderOfflineLogic {
             }
             orderDetail.setTotalPrice(orderDetail.getPrice().multiply(BigDecimal.valueOf(orderDetail.getNum())));
             orderDetail.setPayAmount(orderDetail.getTotalPrice());
-            orderDetail.setNeedPayAmount(orderDetail.getPayAmount());
-            orderDetail.setProfitAmount(orderDetail.getPayAmount());
             orderDetail.setOrderSmallType(orderInfoAddBean.getOrderSmallType());
             orderDetail.setOrderSmallTypeText(orderInfoAddBean.getOrderSmallTypeText());
             totalNum += orderDetail.getNum();
@@ -188,83 +182,18 @@ public class OrderOfflineLogic {
         orderInfo.setCompanyWechatName(adminUser.getCompanyName());
         orderInfo.setPayTypeId(orderInfoAddBean.getPayType().getKey());
         orderInfo.setPayType(orderInfoAddBean.getPayType().getRemark());
-        orderInfo.setIsOld(orderInfoAddBean.getIsOld());
         orderInfo.setSaleType(2);
         orderInfo.setPhone(orderInfo.getRecePhone());
         orderInfo.setUserName(orderInfo.getReceUserName());
         if (StringUtils.isNotBlank(orderTitle)) {
-            orderInfo.setOrderTitle(orderTitle.substring(0,orderTitle.length() - 1));
+            orderInfo.setOrderTitle(orderTitle.substring(0, orderTitle.length() - 1));
         }
         orderInfo.setSource("PC");
 
 
-
-        //旧机回收
-
-        if (!CollectionUtils.isEmpty(orderInfoAddBean.getOrderOldProductAdds())) {
-
-            List<OrderOldProduct> orderOldProducts = new ArrayList<>();
-            List<OrderOldProductItem> orderOldProductItems = new ArrayList<>();
-
-            for (OrderOldProductAdd orderOldProductDTO : orderInfoAddBean.getOrderOldProductAdds()) {
-
-                GoodsCategoryItem goodsCategoryItemDto = goodsCategoryItemService.getById(orderOldProductDTO.getId());
-                OrderOldProduct orderOldProduct = new OrderOldProduct();
-                this.productCategory(orderOldProduct, goodsCategoryItemDto);
-                orderOldProduct.setSaleType(orderInfo.getSaleType());
-                orderOldProduct.setOrderId(orderInfo.getOrderId());
-                orderOldProduct.setId(IdWorker.getIdStr());
-                orderOldProduct.setPayAmount(orderOldProductDTO.getPayAmount());
-                orderOldProduct.setNum(orderOldProductDTO.getNum());
-                orderOldProduct.setYjhxDkFlag(adminUser.getAdminCompanyWechat().getYjhxDkFlag());
-
-                orderOldProduct.setPrice(goodsCategoryItemDto.getPrice());
-
-                for (String goodsCategoryItem : orderOldProductDTO.getItemIds()) {
-
-                    GoodsCategoryItem goodsCategoryItems = goodsCategoryItemService.getById(goodsCategoryItem);
-                    OrderOldProductItem orderOldProductItem = this.productCategoryItem(goodsCategoryItems);
-                    orderOldProductItem.setOrderId(orderOldProduct.getOrderId());
-                    orderOldProductItem.setOrderOldProductId(orderOldProduct.getId());
-
-                    orderOldProductItems.add(orderOldProductItem);
-
-                }
-
-                if (adminUser.getAdminCompanyWechat().getYjhxDkFlag().equals(1))
-                    orderInfo.setPayAmount(orderInfo.getPayAmount().subtract(orderOldProduct.getPayAmount()));
-
-                for (OrderDetail orderDetail : orderDetails) {
-                    orderDetail.setTotalPrice(orderDetail.getTotalPrice().subtract(orderOldProduct.getPayAmount()));
-                    orderDetail.setPayAmount(orderDetail.getTotalPrice().divide(new BigDecimal(orderOldProduct.getNum()),2,BigDecimal.ROUND_HALF_UP));
-
-                    if (orderDetail.getTotalPrice().doubleValue() < 0)
-                        throw new RemoteServiceException("请选择低于新机价格的旧机商品");
-                }
-
-
-                orderOldProducts.add(orderOldProduct);
-
-
-            }
-
-            orderOldProductService.lambdaUpdate().eq(OrderOldProduct::getOrderId,orderInfo.getOrderId()).remove();
-            orderOldProductItemService.lambdaUpdate().eq(OrderOldProductItem::getOrderId,orderInfo.getOrderId()).remove();
-
-            if (!CollectionUtils.isEmpty(orderOldProducts)){
-                orderOldProductService.saveBatch(orderOldProducts);
-            }
-
-            if (!CollectionUtils.isEmpty(orderOldProductItems)){
-                orderOldProductItemService.saveBatch(orderOldProductItems);
-            }
-
-
-        }
-
         orderInfo.insertOrUpdate();
 
-        orderDetailService.lambdaUpdate().eq(OrderDetail::getOrderId,orderInfo.getOrderId()).remove();
+        orderDetailService.lambdaUpdate().eq(OrderDetail::getOrderId, orderInfo.getOrderId()).remove();
         orderDetailService.saveBatch(orderDetails);
 
         List<OrderDetail> orderDetailList = orderDetailService.lambdaQuery().eq(OrderDetail::getOrderId, orderInfo.getOrderId()).list();
@@ -281,23 +210,8 @@ public class OrderOfflineLogic {
         return orderInfo.getOrderId();
     }
 
-    private OrderOldProductItem productCategoryItem(GoodsCategoryItem goodsCategoryItem) {
-        OrderOldProductItem orderOldProductItem = BeanUtil.toBean(goodsCategoryItem, OrderOldProductItem.class);
-        orderOldProductItem.setId(null);
-        orderOldProductItem.setGoodsCategoryItemId(goodsCategoryItem.getId());
-        return orderOldProductItem;
-    }
-
-    private void productCategory(OrderOldProduct orderOldProduct, GoodsCategoryItem goodsCategoryItem) {
-        BeanUtil.copyProperties(goodsCategoryItem,orderOldProduct);
-        orderOldProduct.setId(null);
-        orderOldProduct.setPrice(goodsCategoryItem.getPrice());
-        orderOldProduct.setSpecId(goodsCategoryItem.getId());
-        orderOldProduct.setSpecName(goodsCategoryItem.getDictName());
-    }
-
 
-    private OrderDetail supplyOrderDetail(String orderId,GoodsMaterial gm,OrderDetail orderDetail){
+    private OrderDetail supplyOrderDetail(String orderId, GoodsMaterial gm, OrderDetail orderDetail) {
         if (!StringUtils.equals(gm.getState(), StateEnum.ON.getKey())) {
             throw new RemoteServiceException("物料【" + gm.getGoodsName() + "】状态无效");
         }
@@ -331,38 +245,35 @@ public class OrderOfflineLogic {
         orderDetail.setOutNum(outQty * orderDetail.getNum());
         orderDetail.setPartNum(partsQty * orderDetail.getNum());
         orderDetail.setGoodsMaterialId(gm.getId());
-        orderDetail.setGoodsMaterialName(gm.getGoodsName());
-        orderDetail.setGoodsMaterialSpecsName(gm.getSpecsName());
-        orderDetail.setGoodsMaterialUnit(gm.getUnit());
         orderDetail.setIsVr(StringUtils.equals(gm.getIsVirtyual(), IsYesNoEnum.YES.getKey()));
         return orderDetail;
     }
 
 
-
     /**
      * 详情
+     *
      * @param orderId
      * @return
      */
-    public OrderInfoDetailBean detail(String orderId){
+    public OrderInfoDetailBean detail(String orderId) {
         OrderInfo orderInfo = orderInfoService.getById(orderId);
         List<OrderDetail> orderDetails = orderDetailService.lambdaQuery().eq(OrderDetail::getOrderId, orderId).list();
         OrderInfoDetailBean orderInfoDetailBean = BeanUtil.copyProperties(orderInfo, OrderInfoDetailBean.class);
 
         List<GoodsMaterialStorage> goodsMaterialStorageList = goodsMaterialStorageService.lambdaQuery()
-                .eq(GoodsMaterialStorage::getCompanyWechatId,orderInfo.getCompanyWechatId())
+                .eq(GoodsMaterialStorage::getCompanyWechatId, orderInfo.getCompanyWechatId())
                 .list();
 
-        for(OrderDetail orderDetail : orderDetails){
+        for (OrderDetail orderDetail : orderDetails) {
             List<GoodsMaterialItem> list = goodsMaterialItemService.lambdaQuery().eq(GoodsMaterialItem::getGoodsMaterialId, orderDetail.getGoodsMaterialId()).list();
             GoodsMaterial goodsMaterial = goodsMaterialService.getById(orderDetail.getGoodsMaterialId());
-            if(goodsMaterial == null){
+            if (goodsMaterial == null) {
                 continue;
             }
-            orderDetail.setGoodsMaterialStock(goodsMaterial.getStockQty());
-            if(!StringUtils.equals(orderInfo.getOrderStatus(),OrderStatusEnum.NOPAY.toString())
-                    && !StringUtils.equals(orderInfo.getOrderStatus(),OrderStatusEnum.DFH.toString())) {
+
+            if (!StringUtils.equals(orderInfo.getOrderStatus(), OrderStatusEnum.NOPAY.toString())
+                    && !StringUtils.equals(orderInfo.getOrderStatus(), OrderStatusEnum.DFH.toString())) {
 
                 Integer insideQty = list.stream().filter(v -> v.getType().equals(GoodsMaterialTypeEnum.INSIDE.getKey())).map(GoodsMaterialItem::getQty).reduce(Integer::sum).orElse(0);
                 Integer outQty = list.stream().filter(v -> v.getType().equals(GoodsMaterialTypeEnum.OUT.getKey())).map(GoodsMaterialItem::getQty).reduce(Integer::sum).orElse(0);
@@ -402,22 +313,23 @@ public class OrderOfflineLogic {
 
     /**
      * 审核
+     *
      * @param orderId
      * @param examineStatus
      */
-    public PayDetail examine(String orderId, ExamineStatusEnum examineStatus,String examineRemark,String ip) throws Exception {
+    public PayDetail examine(String orderId, ExamineStatusEnum examineStatus, String examineRemark, String ip) throws Exception {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         OrderInfo orderInfo = orderInfoService.getById(orderId);
-        if(orderInfo == null){
+        if (orderInfo == null) {
             throw new RemoteServiceException("订单不存在");
         }
-        if(orderInfo.getSaleType() != 2){
+        if (orderInfo.getSaleType() != 2) {
             throw new RemoteServiceException("非线下单不可审批");
         }
-        if(!orderInfo.getOrderStatus().equals(OrderStatusEnum.NOPAY.toString())){
+        if (!orderInfo.getOrderStatus().equals(OrderStatusEnum.NOPAY.toString())) {
             throw new RemoteServiceException("非待支付订单不可审批");
         }
-        if(!orderInfo.getExamineStatus().equals(ExamineStatusEnum.WAIT.getKey())){
+        if (!orderInfo.getExamineStatus().equals(ExamineStatusEnum.WAIT.getKey())) {
             throw new RemoteServiceException("非待审批订单不可审批");
         }
         orderInfo.setExamineStatus(examineStatus.getKey());
@@ -426,7 +338,7 @@ public class OrderOfflineLogic {
         orderInfo.setExamineTime(new Date());
 
         PayDetail payDetail = new PayDetail().setIsPay(false);
-        if(examineStatus.getKey().equals(ExamineStatusEnum.OK.getKey())) {
+        if (examineStatus.getKey().equals(ExamineStatusEnum.OK.getKey())) {
             if (orderInfo.getPayTypeId().equals(PayTypeEnum.WECHAT.getKey())) {
                 //需要微信支付的单审批状态得等到支付成功后才能通过
                 orderInfo.setExamineStatus(ExamineStatusEnum.WAIT.getKey());

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderOfflineRefundLogic.java

@@ -249,13 +249,8 @@ public class OrderOfflineRefundLogic {
             if(orderDetail != null){
                 bean.setMainName(orderDetail.getMainName());
                 bean.setSmallName(orderDetail.getSmallName());
-                bean.setGoodsMaterialUnit(orderDetail.getGoodsMaterialUnit());
                 bean.setGoodsName(orderDetail.getGoodsName());
-                if(StringUtils.isNotBlank(orderDetail.getGoodsMaterialSpecsName())) {
-                    bean.setGoodsSpecName(orderDetail.getGoodsMaterialSpecsName());
-                }else{
-                    bean.setGoodsSpecName(orderDetail.getGoodsSpecName());
-                }
+                bean.setGoodsSpecName(orderDetail.getGoodsSpecName());
                 bean.setPrice(orderDetail.getPrice());
                 bean.setNum(orderDetail.getNum());
                 bean.setPayAmount(orderDetail.getPayAmount());

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderRefundLogic.java

@@ -403,17 +403,6 @@ public class OrderRefundLogic {
                 .eq(OrderDetail::getOrderId, orderId)
                 .eq(OrderDetail::getRefund, true).list();
 
-        OrderInfo orderInfo = orderInfoService.getById(orderId);
-
-        for (OrderDetail orderDetail : list) {
-            double div = ArithUtils.div(orderDetail.getRefundNum(), orderDetail.getNum(), 4);
-            double mul = ArithUtils.mul(orderDetail.getShareAmount().doubleValue(), div, 2);
-            BigDecimal totalShareAmount  = BigDecimal.valueOf(mul);
-
-            //1=非团购商品 2=团购商品
-            log.info("【退款开始：】重置结算flag={}金额，需要减掉的金额{}",1, totalShareAmount.doubleValue());
-            orderShareLogic.reloadAmount(orderId, totalShareAmount,1);
-        }
 
         log.info("【退款开始：】退款金额{}", orderRefund.getRefundAmount().doubleValue());
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderShareLogic.java

@@ -400,7 +400,6 @@ public class OrderShareLogic {
             orderShare.setAmount(BigDecimal.ZERO);
             orderShare.setHandleFees(BigDecimal.ZERO);
             orderShare.setStatus(OrderShareStatusEnum.CANCEL.toString());
-            orderInfo.setTotalShareAmount(BigDecimal.valueOf(0));
         } else {
             orderShare.setTotalAmount(orderShare.getTotalAmount().subtract(totalShareAmount));
             orderShare.setAmount(orderShare.getTotalAmount());
@@ -414,7 +413,6 @@ public class OrderShareLogic {
                 orderShare.setAmount(totalShareAmount.subtract(shareTax));
             }
 
-            orderInfo.setTotalShareAmount(orderInfo.getTotalShareAmount().subtract(totalShareAmount));
         }
         orderShare.updateById();
         orderInfo.updateById();

mall-server-api/src/main/resources/mapper/CountMapper.xml

@@ -137,30 +137,6 @@
         </if>
     </select>
 
-    <select id="queryExchangeCodeCountList" resultType="com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean">
-        select
-        count(1) 'num',
-        min(bind_time) 'first_time',
-        sum(amount) 'total_amount',
-        sum(if(status=1,1,0)) 'use_num' ,
-        a.*
-        from gift_exchange_code a
-        where type='SUB' and user_id !=''
-        <if test="keyword != null and keyword !=''">
-            and (a.nick_name like concat('%',#{keyword},'%') or a.user_phone like concat('%',#{keyword},'%'))
-        </if>
-        <if test="adminWebsitId != null and adminWebsitId !=''">
-            and a.admin_websit_id = #{adminWebsitId}
-        </if>
-        <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and a.company_wechat_id in
-            <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-        group by user_id
-    </select>
-
     <select id="countTotalSettleExpense" resultType="com.gree.mall.manager.bean.settle.DataBoardBean">
         SELECT
         SUM(a.settle_order_count) AS waitGatherCount,