bugfix

src/main/java/com/caimei/modules/club/entity/CmUser.java

@@ -86,6 +86,8 @@ public class CmUser implements Serializable {
     private String businessLicenseImage;
     @ApiModelProperty("营业执照号")
     private String socialCreditCode;
+    @ApiModelProperty("审核人")
+    private String checkMan;
 
     //会所用户信息
     private String town; // 区

src/main/java/com/caimei/modules/club/service/impl/CmUserServiceImpl.java

@@ -61,7 +61,7 @@ public class CmUserServiceImpl implements CmUserService {
         newCmClub.setAuditTime(format);
         newCmClub.setAuditNote(cmUser.getAuditNote());
         CmMallAdminUser principal = (CmMallAdminUser) SecurityUtils.getSubject().getPrincipal();
-        newCmClub.setCheckMan(principal.getAccount());
+        newCmClub.setCheckMan(principal.getAccountName());
         newCmClubDao.update(newCmClub);
         cmUser.setClubStatus(cmUser.getAuditStatus());
         //同步到用户表的审核信息中

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

@@ -70,4 +70,10 @@ public class OrderReceiptController {
     public ResponseJson<List<ReceiptPayType>> receiptPayType() {
         return ResponseJson.success(cmDiscernReceiptService.findPayType());
     }
+
+    @ApiOperation("付款帐号列表")
+    @GetMapping("/pay/type")
+    public ResponseJson<List<ReceiptPayType>> payType() {
+        return ResponseJson.success(cmDiscernReceiptService.payType());
+    }
 }

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

@@ -32,4 +32,6 @@ public interface CmDiscernReceiptDao {
     void insertOrderReceipt(ReceiptVo receiptVo);
 
     void insertOrderRelation(OrderRelationRecord record);
+
+    List<ReceiptPayType> findPayType();
 }

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

@@ -16,4 +16,6 @@ public interface CmDiscernReceiptService {
     ReceiptDetail findReceiptDetail(Integer id);
 
     List<ReceiptPayType> findPayType();
+
+    List<ReceiptPayType> payType();
 }

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

@@ -57,4 +57,9 @@ public class CmDiscernReceiptServiceImpl implements CmDiscernReceiptService {
     public List<ReceiptPayType> findPayType() {
         return cmDiscernReceiptDao.findReceiptType();
     }
+
+    @Override
+    public List<ReceiptPayType> payType() {
+        return cmDiscernReceiptDao.findPayType();
+    }
 }

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

@@ -303,6 +303,10 @@ public class PayShopServiceImpl implements PayShopService {
                              *  不在setSplitAccountDetail计算过程中扣除分账手续费
                              */
                             BigDecimal bigDecimal = MathUtil.div(value, 1.001).setScale(2, RoundingMode.HALF_UP);
+                            // 一分钱的时候分账0 ，手续费为最低0.01
+                            if (0.01 == bigDecimal.doubleValue()) {
+                                bigDecimal = BigDecimal.valueOf(0);
+                            }
                             splitBillRule.setSplitBillAmount(bigDecimal);
                             splitBillRule.setSplitBillMerchantNo(key);
                             splitBillRules.add(splitBillRule);
@@ -330,7 +334,7 @@ public class PayShopServiceImpl implements PayShopService {
                                             shopOrder.setPayedShopAmount(paidShop);
                                             //todo
 //                                            if (MathUtil.compare(shopOrder.getShouldPayShopAmount(), paidShop) == 0) {
-                                                shopOrder.setPayStatus(3);
+                                            shopOrder.setPayStatus(3);
 //                                            } else {
 //                                                shopOrder.setPayStatus(2);
 //                                            }
@@ -426,7 +430,7 @@ public class PayShopServiceImpl implements PayShopService {
         });
         NewShopOrder shopOrder = newShopOrderDao.findColdChainShopOrder(shopOrders.get(0).getOrderId());
         // 联合丽格冷链费
-        if (null != shopOrder && 1 == shopOrder.getIsColdChina() && shopOrder.getShopPostFee() >= 0) {
+        if (null != shopOrder && shopOrder.getShopPostFee() >= 0) {
             try {
                 orderUtils.settleOrder("JSLLF" + shopOrder.getShopOrderId() + substring, shopOrder.getShopPostFee(), Constant.LHLGCUSTOMERNUM, shopOrder.getShopOrderId(), 6);
             } catch (Exception e) {

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

@@ -147,6 +147,7 @@ public class OrderUtils {
             settleOrganize = payShopDao.findSettleSum(shopOrder.getShopOrderId(), 3);
             waitSettleOrganize = MathUtil.sub(organizeFee.get(), settleOrganize).doubleValue();
             // 减0.1%分账手续费
+
             cmFee = MathUtil.div(cmFee, 1.001, 2).doubleValue();
             v = MathUtil.div(v, 1.001, 2).doubleValue();
 

src/main/resources/mapper/CmDiscernReceiptMapper.xml

@@ -181,8 +181,7 @@
     <select id="findReceiptType" resultType="com.caimei.modules.order.entity.ReceiptPayType">
         select type as id, bankAccount as name
         from cm_offline_collection
-        where type in (12, 13, 14, 15, 17, 29, 30)
-           or organizeId = 4
+        where type in (12,17,13,14,15,29,30,31)
     </select>
 
     <select id="findOrderIds" resultType="java.lang.String">
@@ -204,4 +203,10 @@
           and cdr.receiptStatus = '3'
           and cdr.delFlag = '0'
     </select>
+
+    <select id="findPayType" resultType="com.caimei.modules.order.entity.ReceiptPayType">
+        select type as id, bankAccount as name
+        from cm_offline_collection
+        where organizeId = 4
+    </select>
 </mapper>

src/main/resources/mapper/CmUserMapper.xml

@@ -11,14 +11,15 @@
         a.bindMobile,
         a.clubStatus,
         a.registerTime,
-        a.auditTime,
         c.clubId,
         c.linkMan AS "linkMan",
         t.name as "town",
         ci.name as "city",
         p.name as "province",
         c.address AS "address",
-        a.userId
+        a.userId,
+        c.checkMan,
+        c.auditTime
         FROM user a
         LEFT JOIN club c on c.userId = a.userId
         LEFT JOIN town t on t.townId = c.townId