二手商品bugfix

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

@@ -718,7 +718,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
         }
     }
 
-    private void updateShopOrderAmount(Integer orderId) {
+    public void updateShopOrderAmount(Integer orderId) {
         //修改子订单付供应商金额
         List<NewShopOrder> shopOrders = newShopOrderDao.findListByOrderID(orderId);
         shopOrders.removeIf(s -> 998 == s.getShopID());
@@ -752,7 +752,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
      *
      * @param shopOrderIds
      */
-    private void theOnlineRefund(List<Integer> shopOrderIds) {
+    public void theOnlineRefund(List<Integer> shopOrderIds) {
         List<CmReceiptOrderRelation> relationList = cmReceiptOrderRelationDao.findByShopOrderIds(shopOrderIds);
 //        AtomicDouble allRefund = new AtomicDouble(0);
 //        relationList.forEach(r -> allRefund.getAndSet(Double.parseDouble(r.getAssociateAmount())));
@@ -773,7 +773,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
         }
     }
 
-    void onlinePay(String orderRequestNo, String money, Integer shopOrderId) {
+    public void onlinePay(String orderRequestNo, String money, Integer shopOrderId) {
         AppPayRefundOrderVo orderVo = new AppPayRefundOrderVo();
         orderVo.setP1_bizType("AppPayRefund");
         String splitCode = cmReturnedPurchaseDao.findSplitCode(shopOrderId);
@@ -798,7 +798,6 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             if ((Integer) resultMap.get("statusCode") == HttpStatus.SC_OK) {
                 String resultMsg = (String) resultMap.get("response");
                 AppPayRefundOrderResponseVo orderResponseVo = JSONObject.parseObject(resultMsg, AppPayRefundOrderResponseVo.class);
-                //String[] excludes = {"rt3_retMsg"};
                 String assemblyRespOriSign = MyBeanUtils.getSignedByPresetParameter(orderResponseVo, AppPayRefundOrderResponseVo.NEED_SIGN_PARAMS);
                 assemblyRespOriSign += Constant.SAOMA;
                 logger.info("组装返回结果签名串：" + assemblyRespOriSign);
@@ -867,7 +866,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
         }
     }
 
-    private <T> T postForm(Map<String, String> params, String url, String sign, Class<T> clazz) {
+    public  <T> T postForm(Map<String, String> params, String url, String sign, Class<T> clazz) {
         FormBody.Builder builder = new FormBody.Builder();
         for (Map.Entry<String, String> entry : params.entrySet()) {
             builder.add(entry.getKey(), entry.getValue());

src/main/java/com/caimei/modules/product/dao/ProductNewDao.java

@@ -63,4 +63,6 @@ public interface ProductNewDao extends CrudDao<Product> {
     String findSplitCodeByProduct(Integer productID);
 
     Integer getShopIdByName(String shopName);
+
+    List<SplitCode> findSecondSplitCode(String id);
 }

src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -16,6 +16,7 @@ import com.caimei.modules.product.service.CmSecondHandDetailService;
 import com.caimei.modules.product.service.CmSecondHandTransactionService;
 import com.caimei.modules.product.service.ProductNewService;
 import com.caimei.modules.sys.utils.UploadImageUtils;
+import com.caimei.modules.user.entity.SplitCode;
 import com.caimei.po.ProductImage;
 import com.caimei.redis.RedisService;
 import com.thinkgem.jeesite.common.config.Global;
@@ -187,6 +188,8 @@ public class CmSecondHandDetailController extends BaseController {
         }
 
         cmSecondHandDetailService.setValue(cmSecondHandDetail);
+        List<SplitCode> splitCodeList = productNewDao.findSecondSplitCode(cmSecondHandDetail.getId());
+        model.addAttribute("splitCodeList",splitCodeList);
         model.addAttribute("cmSecondHandDetail", cmSecondHandDetail);
         return "modules/product/cmSecondHandDetailForm";
     }

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -759,6 +759,12 @@
     <select id="getShopIdByName" resultType="java.lang.Integer">
         select shopID from shop where name like concat('%',#{shopName},'%')
     </select>
-
+    <select id="findSecondSplitCode" resultType="com.caimei.modules.user.entity.SplitCode">
+        select css.shopId,css.commercialCode as splitCode,css.codeDetail as codeRemark
+        from cm_shop_splitcode css
+        left join product p on p.shopID = css.shopId
+        left join cm_second_hand_detail cshd on p.productID = cshd.productID
+        where cshd.id=#{id}
+    </select>
 </mapper>
 

src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -6,7 +6,7 @@
 		a.shopID AS "shopID",
 		a.checkMan as "checkMan",
 		a.userID AS "userID",
-		ifnull(u.name,a.name) AS "name",
+		a.name AS "name",
 		u.userName AS "sname",
 		a.logo AS "logo",
 		a.legalPerson AS "legalPerson",

src/main/webapp/WEB-INF/views/modules/product/cmSecondHandDetailForm.jsp

@@ -406,12 +406,19 @@
             </form:select>
         </div>
     </div>
+    <c:if test="${not empty cmSecondHandDetail.id}">
     <div class="control-group">
         <label class="control-label">线上分账账号：</label>
         <div class="controls">
-            <form:input path="splitCode" value="${cmSecondHandDetail.splitCode}" type="text" maxlength="15"/>
+            <form:select path="splitCode" class="select-ele input-medium">
+                <form:option value="" label="请选择"/>
+                <c:forEach items="${splitCodeList}" var="splitCodeList" varStatus="index">
+                    <form:option value="${splitCodeList.splitCode}" label="${splitCodeList.codeRemark}"/>
+                </c:forEach>
+            </form:select>
         </div>
     </div>
+    </c:if>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>商品品牌：</label>
         <div class="controls">