订单来源/协销显示需求

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -587,6 +587,8 @@ public class CmRefundsProductController extends BaseController {
             BpClause bpClause = new BpClause();
             bpClause.setEnabledStatus("1");
             List<BpClause> bpClauses = bpClauseService.findList(bpClause);
+            Integer lastReceiptDetailId = cmDiscernReceiptDao.findOrderLastReceiptDetailId(newOrder.getOrderID().toString());
+            model.addAttribute("lastReceiptDetailId", lastReceiptDetailId);
             model.addAttribute("from", from);
             model.addAttribute("bpClauses", bpClauses);
             model.addAttribute("cmReturnedPurchaseList", dataList);

src/main/java/com/caimei/modules/weisha/web/CmMallOrganizeController.java

@@ -17,7 +17,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
+ /**
  * 组织列表Controller
  *
  * @author plf

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -114,7 +114,7 @@
 		co.splitFlag AS splitFlag,
 		co.postageOrderFlag AS postageOrderFlag,
 		(case when co.orderType = '0' then
-			(select linkMan1 from serviceprovider where serviceProviderID = co.spID)
+			(select case status when 91 then '采美默认协销经理(官方账号)' else linkMan1 end from serviceprovider where serviceProviderID = co.spID)
 		else
 			''
 		end) AS spName,

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

@@ -82,7 +82,7 @@
 	</sql>
 
 	<sql id="otherColumns">
-		,sp.linkMan1 AS "spName",
+		,case sp.status when 91 then '采美默认协销经理(官方账号)' else sp.linkMan1 end AS "spName",
 		d.name AS "province",
 		c.name AS "city",
 		b.name AS  "town",

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -357,6 +357,7 @@
                 </td>
                 <td>
                     应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2" />(账户余额抵扣：${order.balancePayFee})
+                    <a href="${ctx}/order/cmDiscernReceipt/detail?id=${lastReceiptDetailId}" style="text-decoration: underline;margin-left: 20px">查看订单收款情况</a>
                 </td>
                 <td>
                     经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00" maxFractionDigits="2" />

src/main/webapp/WEB-INF/views/modules/order/orderForm.jsp

@@ -159,6 +159,7 @@
             <form:option value="2" label="CRM" />
             <form:option value="1" label="PC" />
             <form:option value="5" label="外单" />
+            <form:option value="6" label="小程序" />
           </form:select>
         </td>
       </tr>