bugfix

src/main/java/com/caimei/modules/groupbuy/entity/BuyerDto.java

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import nonapi.io.github.classgraph.json.Id;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * @author zzj
@@ -57,9 +60,11 @@ public class BuyerDto {
     private Integer clubCount;
 
     @ApiModelProperty("查询字段：创建起始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String startSaveTime;
 
     @ApiModelProperty("查询字段：创建终止时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String endSaveTime;
 
     @ApiModelProperty("查询字段：需求状态 1未完成 2已完成 3已删除")

src/main/java/com/caimei/modules/groupbuy/entity/ProcurePo.java

@@ -34,7 +34,7 @@ public class ProcurePo {
     private String number;
 
     @ApiModelProperty("创建时间")
-    private String saveTime;
+    private Long saveTime;
 
     @ApiModelProperty("创建人Id")
     private String createUserId;

src/main/java/com/caimei/modules/groupbuy/service/ProcureService.java

@@ -9,6 +9,7 @@ import com.caimei.modules.groupbuy.entity.BuyerDto;
 import com.caimei.modules.groupbuy.entity.ProcurePo;
 import com.caimei.modules.shiro.dao.UserDao;
 import com.caimei.utils.ResponseJson;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.PageImpl;
@@ -23,10 +24,15 @@ import sun.util.calendar.BaseCalendar;
 
 import javax.annotation.Resource;
 import javax.xml.ws.Response;
+import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.regex.Pattern;
 
+@Slf4j
 @Service
 public class ProcureService {
 
@@ -150,8 +156,8 @@ public class ProcureService {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         procurePos.forEach(p -> {
             BuyerDto buyerDto = new BuyerDto();
-            Date date = new Date(Long.parseLong(p.getSaveTime()));
-            p.setSaveTime(dateFormat.format(date));
+            String format = dateFormat.format(new Date(p.getSaveTime()));
+            buyerDto.setSaveTime(format);
             int count = (int) mongoTemplate.count(Query.query(Criteria.where("procureId").is(p.getId())), AdditionalPo.class);
             CmUser linkMan = userDao.findLinkMan(p.getUserId());
             buyerDto.setLinkMan(linkMan.getLinkMan());
@@ -200,11 +206,17 @@ public class ProcureService {
                 query.addCriteria(Criteria.where("isAchieve").is(dto.getStatus().toString()));
             }
         }
-        if (StringUtils.isNotBlank(dto.getStartSaveTime())) {
-            query.addCriteria(Criteria.where("saveTime").gte(dto.getStartSaveTime()));
-        }
-        if (StringUtils.isNotBlank(dto.getEndSaveTime())) {
-            query.addCriteria(Criteria.where("saveTime").lte(dto.getEndSaveTime()));
+
+        if (StringUtils.isNotBlank(dto.getStartSaveTime()) && StringUtils.isNotBlank(dto.getEndSaveTime())) {
+            /**
+             * 传入结束时间为当日0点，加一天改为当日结束时间
+             */
+            Instant start = Instant.parse(dto.getStartSaveTime());
+            Instant end = Instant.parse(dto.getEndSaveTime());
+            end = end.plus(1, ChronoUnit.DAYS);
+            long st = start.toEpochMilli();
+            long ed = end.toEpochMilli();
+            query.addCriteria(Criteria.where("saveTime").gte(st).lte(ed));
         }
         return query;
     }

src/main/java/com/caimei/modules/homepage/dao/ThemeDao.java

@@ -15,4 +15,6 @@ public interface ThemeDao extends BaseMapper<Theme> {
     List<Theme> findList(Theme theme);
 
     void checkStatus(Integer id);
+
+    void closeAll();
 }

src/main/java/com/caimei/modules/homepage/enity/Active.java

@@ -1,6 +1,8 @@
 package com.caimei.modules.homepage.enity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -11,6 +13,7 @@ import java.util.List;
 /**
  * @author zzj
  */
+@ApiModel("活动")
 @Data
 public class Active implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -18,21 +21,19 @@ public class Active implements Serializable {
     private Integer id;
     private Integer organizeId;
     private String topic;
+    @ApiModelProperty("0停用 1启用")
     private Integer enabledStatus;
-    /**
-     * 活动类型 1商品列表 2宣传图（一张） 3宣传图（多张）
-     */
+
+    @ApiModelProperty("活动类型 1商品列表 2宣传图（一张） 3宣传图（多张）")
     private Integer activeType;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date addTime;
-    /**
-     * 回显商品
-     */
+
+    @ApiModelProperty("回显商品")
     @TableField(exist = false)
     private List<BackProduct> products;
-    /**
-     * 活动类型不为1则用images
-     */
+
+    @ApiModelProperty("活动类型不为1则用images")
     @TableField(exist = false)
     private List<ActiveImages> images;
 }

src/main/java/com/caimei/modules/homepage/service/impl/PageServiceImpl.java

@@ -169,6 +169,14 @@ public class PageServiceImpl implements PageService {
 
     @Override
     public ResponseJson saveTheme(Theme theme) {
+        /**
+         * 只允许一个启用的专题活动
+         *  状态0停用 1启用
+         *  本次保存为启用，则停用其他
+         */
+        if (1 == theme.getEnabledStatus()) {
+            themeDao.closeAll();
+        }
         if (null != theme.getId()) {
             themeDao.updateById(theme);
             return ResponseJson.success("修改成功!");

src/main/java/com/caimei/modules/order/controller/CmReturnedPurchaseController.java

@@ -1,18 +1,14 @@
 package com.caimei.modules.order.controller;
 
 import com.caimei.modules.club.entity.Page;
-import com.caimei.modules.order.entity.BpClause;
 import com.caimei.modules.order.entity.CmReturnedPurchase;
 import com.caimei.modules.order.entity.NewOrder;
-import com.caimei.modules.order.service.BpClauseService;
 import com.caimei.modules.order.service.CmReturnedPurchaseService;
 import com.caimei.modules.order.service.NewOrderService;
-import com.caimei.modules.order.util.OrderUtils;
 import com.caimei.utils.JsonModel;
 import com.caimei.utils.ResponseJson;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,9 +16,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Api(tags = "退货退款api")
 @RequiredArgsConstructor
@@ -45,13 +39,21 @@ public class CmReturnedPurchaseController {
     }
 
 
-    @ApiImplicitParam(required = true, name = "退款单id", value = "id")
-    @ApiOperation("用户退款详情")
+    @ApiOperation("用户退款单详情")
     @GetMapping(value = "/toReturnRecord/{id}")
     public ResponseJson<NewOrder> toReturnRecord(@PathVariable("id") Integer id) {
         CmReturnedPurchase cmReturnedPurchase = cmReturnedPurchaseService.get(id);
         NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderId().toString());
+        newOrder.setCmReturnedPurchase(cmReturnedPurchase);
         cmReturnedPurchaseService.toReturnRecord(newOrder, cmReturnedPurchase);
         return ResponseJson.success(newOrder);
     }
+
+    @ApiOperation("退货退款详情")
+    @GetMapping(value = "/returnDetail/{orderId}")
+    public ResponseJson<List<NewOrder>> returnDetail(@PathVariable("orderId") Integer orderId) {
+        return ResponseJson.success(cmReturnedPurchaseService.getReturnDetailList(orderId));
+    }
+
+
 }

src/main/java/com/caimei/modules/order/controller/OrganizeOrderController.java

@@ -141,7 +141,6 @@ public class OrganizeOrderController {
     }
 
     @ApiOperation("收退款记录")
-    @ApiImplicitParam(required = true, name = "orderId", value = "订单Id")
     @GetMapping(value = "toRefundRecord")
     public JsonModel toRefundRecord(CmReturnedPurchase cmReturnedPurchase, String from) {
         JsonModel jsonModel = JsonModel.newInstance();

src/main/java/com/caimei/modules/order/dao/CmReturnedPurchaseDao.java

@@ -21,4 +21,6 @@ public interface CmReturnedPurchaseDao {
     CmReturnedPurchase get(Integer id);
 
     List<NewShopOrder> findReturnShopOrder(Integer id);
+
+    List<Integer> findReturnIds(Integer orderId);
 }

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -44,7 +44,7 @@ public interface NewOrderDao {
 
     void updateOrderStatus(Integer orderDeliverStatus, String orderStatus, Integer orderId);
 
-    Integer findOutLinePay(Integer orderId);
+    Integer findOnlinePay(Integer orderId);
 
     List<String> findNotes(Integer orderId);
 

src/main/java/com/caimei/modules/order/dao/PayShopDao.java

@@ -82,4 +82,6 @@ public interface PayShopDao {
     void backPayShop(Integer id);
 
     List<SettleRecord> findSettleRecord(Integer orderId);
+
+    void insertPayRecordForNow(OrderPayShopRecord shopRecord);
 }

src/main/java/com/caimei/modules/order/entity/ReceiptVo.java

@@ -72,4 +72,7 @@ public class ReceiptVo implements Serializable {
     @ApiModelProperty("收款时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String receiptTime;
+
+    @ApiModelProperty("支付方式展示字段")
+    private String bankNameType;
 }

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -4,7 +4,6 @@ import com.caimei.modules.order.entity.CmReturnedPurchase;
 import com.caimei.modules.order.entity.NewOrder;
 
 import java.util.List;
-import java.util.Map;
 
 public interface CmReturnedPurchaseService {
 
@@ -17,4 +16,6 @@ public interface CmReturnedPurchaseService {
     CmReturnedPurchase get(Integer id);
 
     void toReturnRecord(NewOrder newOrder,CmReturnedPurchase cmReturnedPurchase);
+
+    List<NewOrder> getReturnDetailList(Integer orderId);
 }

src/main/java/com/caimei/modules/order/service/impl/CmDiscernReceiptServiceImpl.java

@@ -16,8 +16,7 @@ public class CmDiscernReceiptServiceImpl implements CmDiscernReceiptService {
 
     @Resource
     private CmDiscernReceiptDao cmDiscernReceiptDao;
-    @Resource
-    private NewOrderDao newOrderDao;
+
 
     @Override
     public Double findOrderReceipt(Integer orderId) {

src/main/java/com/caimei/modules/order/service/impl/CmReceiptOrderRelationServiceImpl.java

@@ -29,8 +29,8 @@ public class CmReceiptOrderRelationServiceImpl implements CmReceiptOrderRelation
         if ("11".equals(order.getStatus()) || "12".equals(order.getStatus()) || "13".equals(order.getStatus())) {
             checkFlag = 1;
         } else if ("21".equals(order.getStatus()) || "22".equals(order.getStatus()) || "23".equals(order.getStatus())) {
-            Integer count = orderDao.findOutLinePay(order.getOrderId());
-            checkFlag = count > 0 ? 1 : 0;
+            Integer count = orderDao.findOnlinePay(order.getOrderId());
+            checkFlag = count == 0 ? 1 : 0;
         } else {
             checkFlag = 0;
         }

src/main/java/com/caimei/modules/order/service/impl/CmReturnedPurchaseServiceImpl.java

@@ -3,6 +3,7 @@ package com.caimei.modules.order.service.impl;
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.CmReturnedPurchaseService;
+import com.caimei.modules.order.service.NewOrderService;
 import com.caimei.modules.order.service.NewShopOrderService;
 import com.caimei.modules.order.util.OrderUtils;
 import com.caimei.utils.AppUtils;
@@ -25,6 +26,8 @@ public class CmReturnedPurchaseServiceImpl implements CmReturnedPurchaseService
     @Resource
     private NewShopOrderService newShopOrderService;
     @Resource
+    private NewOrderService orderService;
+    @Resource
     private OrderUtils orderUtil;
 
     @Override
@@ -130,4 +133,17 @@ public class CmReturnedPurchaseServiceImpl implements CmReturnedPurchaseService
             s.setNewOrderProducts(orderProducts);
         });
     }
+
+    @Override
+    public List<NewOrder> getReturnDetailList(Integer orderId) {
+        NewOrder newOrder = orderService.get(orderId.toString());
+        List<Integer> ids = cmReturnedPurchaseDao.findReturnIds(orderId);
+        ArrayList<NewOrder> newOrders = new ArrayList<>();
+        ids.forEach(i -> {
+            CmReturnedPurchase cmReturnedPurchase = new CmReturnedPurchase();
+            toReturnRecord(newOrder, cmReturnedPurchase);
+            newOrders.add(newOrder);
+        });
+        return newOrders;
+    }
 }

src/main/java/com/caimei/modules/order/service/impl/PayShopServiceImpl.java

@@ -193,6 +193,7 @@ public class PayShopServiceImpl implements PayShopService {
         return ResponseJson.success();
     }
 
+    @Transactional(readOnly = false, rollbackFor = Exception.class)
     @Override
     public ResponseJson splitShopOrders(List<Integer> shopOrderIds) {
         Integer xsfzmds = (Integer) redisService.get("OGFZMDS");
@@ -312,10 +313,9 @@ public class PayShopServiceImpl implements PayShopService {
                                     shopRecord.setShopOrderNo(shopOrderNo);
                                     shopRecord.setPayAmount(splitAmount);
                                     shopRecord.setPayType(6);
-                                    shopRecord.setPayTime(new Date());
                                     shopRecord.setPayShopId(payShop.getPayShopId());
                                     shopRecord.setStatus(1);
-                                    payShopDao.insertPayRecord(shopRecord);
+                                    payShopDao.insertPayRecordForNow(shopRecord);
                                 }
                                 // 子订单是否全部付款
                                 Integer count = newShopOrderDao.findUnPaidShopOrder(orderRelation.getOrderId());
@@ -478,7 +478,7 @@ public class PayShopServiceImpl implements PayShopService {
             // 总价 * 供应商百分比 = 成本分账金额
             double costPrice = MathUtil.mul(total, MathUtil.div(orderProduct.getShopPercent(), 100)).doubleValue();
             totalCostPrice.set(MathUtil.add(costPrice, totalCostPrice.get()));
-            double organize = MathUtil.mul(total, MathUtil.div(orderProduct.getOrganizePercent(), 100)).doubleValue();
+            double organize = MathUtil.mul(total, MathUtil.div(orderProduct.getOrganizePercent(), 100), 2).doubleValue();
             totalOrganize.set(MathUtil.add(organize, totalOrganize.get()));
             /**
              * todo

src/main/java/com/caimei/modules/order/util/OrderUtils.java

@@ -284,7 +284,8 @@ public class OrderUtils {
                 //accountPayOrderExt.setInMerchantNo(splitMoneyVo.getName());
                 //accountPayOrderExt.setAmount(splitMoneyVo.getSplitMoney());
                 accountPayOrderExt.setOrderType(AccountPayOrderType.TRANSFER);
-                accountPayOrderExt.setServerCallbackUrl(Constant.prodSplit);
+                // todo
+                accountPayOrderExt.setServerCallbackUrl(Constant.betaSplit);
                 accountPayOrderExt.setGoodsName("分账");
                 if (null != splitBillRules && splitBillRules.size() > 0) {
                     accountPayOrderExt.setSplitBillRules(splitBillRules);

src/main/java/com/caimei/modules/products/entity/Sku.java

@@ -1,6 +1,8 @@
 package com.caimei.modules.products.entity;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -9,40 +11,28 @@ import java.util.List;
  * @author zzj
  */
 
+@ApiModel("商品sku")
 @Data
 public class Sku {
 
+    @ApiModelProperty("外部商城skuId")
     private Integer id;
+    @ApiModelProperty("外部商城商品Id")
     private Integer productId;
-
-    /**
-     * 比例成本百分比
-     */
-    private Double costProportional;
-    /**
-     * 成本价选中标志：1固定成本 2比例成
-     */
-    private Integer costCheckFlag;
-
+    @ApiModelProperty("采美skuId")
     private Integer skuId;
-    /**
-     * 起订量
-     */
+    @ApiModelProperty("起订量")
     private Integer minBuyNumber;
-    /**
-     * 成本价
-     */
+    @ApiModelProperty("成本价")
     private Double costPrice;
-    /**
-     * 库存
-     */
-    private Integer stock;
-    /**
-     * 机构价格
-     */
+    @ApiModelProperty("售价")
     private Double price;
-    /**
-     * 包装规格
-     */
+    @ApiModelProperty("包装规格")
     private String unit;
+    @ApiModelProperty("分账组织佣金比例")
+    private Integer organizePercent;
+    @ApiModelProperty("分账供应商成本比例")
+    private Integer  shopPercent;
+    @ApiModelProperty("分账采美佣金比例")
+    private Integer cmPercent;
 }

src/main/resources/mapper/ActiveMapper.xml

@@ -88,10 +88,10 @@
             <if test="topic != null and topic != ''">
                 AND topic LIKE concat('%',#{topic},'%')
             </if>
-            <if test="enabledStatus != null and enabledStatus != ''">
+            <if test="enabledStatus != null">
                 AND enabledStatus = #{enabledStatus}
             </if>
-            <if test="activeType !=null and activeType !=''">
+            <if test="activeType !=null">
                 AND activeType = #{activeType}
             </if>
         </where>

src/main/resources/mapper/BannerMapper.xml

@@ -19,19 +19,19 @@
             <if test="bannerImage != null and bannerImage != ''">
                 bannerImage = #{bannerImage},
             </if>
-            <if test="sort != null and sort != ''">
+            <if test="sort != null">
                 sort = #{sort},
             </if>
-            <if test="jumpType != null and jumpType != ''">
+            <if test="jumpType != null">
                 jumpType = #{jumpType},
             </if>
-            <if test="jumpProductId != null and jumpProductId != ''">
+            <if test="jumpProductId != null">
                 jumpProductId = #{jumpProductId},
             </if>
-            <if test="jumpActiveId != null and jumpActiveId != ''">
+            <if test="jumpActiveId != null">
                 jumpActiveId = #{jumpActiveId},
             </if>
-            <if test="enabledStatus != null and enabledStatus != ''">
+            <if test="enabledStatus != null">
                 enabledStatus = #{enabledStatus},
             </if>
             updateTime = now()

src/main/resources/mapper/CmDiscernReceiptMapper.xml

@@ -67,10 +67,12 @@
         left join cm_order cr on cr.orderId = crr.orderId
         left join user u on u.userId = cr.userId
         -- 子订单
-        left join cm_shop_order cso on cso.shopOrderId = crr.orderId
+        left join cm_shop_order cso on cso.orderId = crr.orderId
         LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
         <where>
-            cr.organizeId = #{organizeId}
+            <if test="receiptId != null and receiptId != 0 ">
+                AND cr.organizeId = #{organizeId}
+            </if>
             <if test="receiptId != null and receiptId != 0 ">
                 AND a.id = #{receiptId}
             </if>

src/main/resources/mapper/CmMallOrganizeProductsMapper.xml

@@ -136,11 +136,9 @@
 
     <select id="findSkus" resultType="com.caimei.modules.products.entity.Sku">
         select cmps.id,
-               cs.productId,
+               cmps.mallProductId as productId,
                cs.skuId,
-               costProportional,
-               costCheckFlag,
-               ROUND(IF(costCheckFlag = 1, costprice, cs.price * costProportional / 100), 2) AS costPrice,
+               ROUND(cmps.price * cmps.shopPercent / 100,2) AS costPrice,
                cmps.minBuyNumber,
                cmps.price,
                cs.unit

src/main/resources/mapper/CmReturnedPurchaseMapper.xml

@@ -208,4 +208,11 @@
         and crp.status = 2
         and crp.delFlag = 0
     </select>
+
+    <select id="findReturnIds" resultType="java.lang.Integer">
+        select id
+        from cm_returned_purchase
+        where orderId = #{orderId}
+        and delFlag =0
+    </select>
 </mapper>

src/main/resources/mapper/NewOrderMapper.xml

@@ -444,7 +444,6 @@
           AND cror.splitStatus = 0
           AND cdr.payWay = 1
           AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
-          AND co.organizeID = 0
           AND co.orderType != 2
           AND co.refundType != 2
           AND p.splitCode != 'E1807059160'
@@ -670,12 +669,12 @@
         where orderId = (select orderId from cm_order_product where orderProductId = #{orderProductId})
     </select>
 
-    <select id="findOutLinePay" resultType="java.lang.Integer">
+    <select id="findOnlinePay" resultType="java.lang.Integer">
         SELECT COUNT(receiptId)
         FROM cm_receipt_order_relation cror
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         WHERE cror.orderid = #{orderId}
-          AND cdr.payway = 2
+          AND cdr.payway = 1
           AND cdr.delFlag = 0
           AND cror.delFlag = 0
     </select>

src/main/resources/mapper/PayShopDao.xml

@@ -53,6 +53,13 @@
         VALUES (#{settleAmount}, #{settleType}, #{shopOrderId}, #{splitCode}, now())
     </insert>
 
+    <insert id="insertPayRecordForNow">
+        insert into cm_pay_shop_record(shopID, shopOrderID, shopOrderNo, payAmount, payCmAmount,
+                                       paymentType, payType, payShopID, status, payTime)
+        values (#{shopId}, #{shopOrderId}, #{shopOrderNo}, #{payAmount}, #{payCmAmount}, 1, #{payType},
+                #{payShopId}, #{status}, now())
+    </insert>
+
     <update id="updatePayRecord">
         UPDATE cm_pay_shop_record
         SET payAmount = #{payAmount},

src/main/resources/mapper/ThemeMapper.xml

@@ -7,12 +7,18 @@
     <update id="checkStatus">
         UPDATE cm_mall_theme
         SET enabledStatus=
-                (CASE WHEN enabledStatus = 1
-                          THEN 0
-                      ELSE 1 END)
+                (CASE
+                     WHEN enabledStatus = 1
+                         THEN 0
+                     ELSE 1 END)
         WHERE id = #{id}
     </update>
 
+    <update id="closeAll">
+        UPDATE cm_mall_theme
+        SET enabledStatus = 0
+    </update>
+
     <select id="findList" resultType="com.caimei.modules.homepage.enity.Theme">
         select id, organizeId, topic, image, enabledStatus, jumpType, jumpProductId, jumpActiveId, addTime
         from cm_mall_theme