no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/goods/GoodsController.java

@@ -179,4 +179,15 @@ public class GoodsController {
         return ResponseHelper.success(ossUtil.getAccessUrl() + filePath);
     }
 
+    @PostMapping("/advice/notice")
+    @ApiOperation("到货通知")
+    public ResponseHelper<String> qrcode(
+            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId,
+            @ApiParam(value = "商品规格id",required = true) @RequestParam String goodsSpecId
+    ) throws IOException, RemoteServiceException {
+
+
+        return ResponseHelper.success();
+    }
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/member/UserCompanyCreditBean.java

@@ -1,20 +0,0 @@
-package com.gree.mall.manager.bean.member;
-
-import com.gree.mall.manager.plus.entity.UserCompanyCredit;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@ApiModel
-@Data
-public class UserCompanyCreditBean extends UserCompanyCredit {
-
-    @ApiModelProperty(value = "师傅名称")
-    private String nickName;
-
-    @ApiModelProperty(value = "手机号")
-    private String mobile;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/member/UserCompanyCreditVO.java

@@ -0,0 +1,80 @@
+package com.gree.mall.manager.bean.member;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.IsEnum;
+import com.gree.mall.manager.plus.entity.UserCompanyCredit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+@ZfireField(tbName = "a")
+public class UserCompanyCreditVO {
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "师傅id")
+    private String userId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "企业微信id")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "商户名称")
+    private String companyWechatName;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "师傅名称")
+    private String nickName;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "授权额度")
+    private BigDecimal creditLimit;
+
+    @ApiModelProperty(value = "可用额度")
+    private BigDecimal availableCredit;
+
+    @ApiModelProperty(value = "是否启用授信功能")
+    private IsEnum isCreditEnabled;
+
+    @ApiModelProperty(value = "账单日")
+    private Integer billingDay;
+
+    @ApiModelProperty(value = "账期天数")
+    private Integer paymentGracePeriod;
+
+//    @ApiModelProperty(value = "待生效的账单日")
+//    private Integer pendingBillingDay;
+//
+//    @ApiModelProperty(value = "上次修改账单日的日期")
+//    private Date lastBillingDayChangeDate;
+//
+//    @ApiModelProperty(value = "本年度修改账单日的次数")
+//    private Integer billingDayChangeCountThisYear;
+//
+//    @ApiModelProperty(value = "上次生成账单日期（已加1秒，比如上次获取授信记录明细结束时间为2025-10-22 23:59:59, 再加1秒等于下次执行的开始时间2025-10-23 00:00:00）")
+//    private Date lastBillingDate;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+
+}

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

@@ -14,7 +14,7 @@ import com.gree.mall.manager.bean.listvo.order.PunishOrderVO;
 import com.gree.mall.manager.bean.listvo.param.ExamineZfireParamBean;
 import com.gree.mall.manager.bean.listvo.param.WorkOrderZfireParam;
 import com.gree.mall.manager.bean.listvo.workorder.*;
-import com.gree.mall.manager.bean.member.UserCompanyCreditBean;
+import com.gree.mall.manager.bean.member.UserCompanyCreditVO;
 import com.gree.mall.manager.bean.member.UserCompanyDeliveryVO;
 import com.gree.mall.manager.bean.order.LeaseOrderVO;
 import com.gree.mall.manager.bean.order.OrderPickTimeConfigVO;
@@ -562,16 +562,11 @@ public interface CommonMapper {
 
     /**
      * 商户授信人员
-     * @param objectPage
-     * @param companyWechatId
-     * @param nickName
-     * @param mobile
+     * @param page
+     * @param zfireParamBean
      * @return
      */
-    IPage<UserCompanyCreditBean> companyCredit(Page<Object> objectPage,
-                                               @Param("companyWechatId") String companyWechatId,
-                                               @Param("nickName") String nickName,
-                                               @Param("mobile") String mobile);
+    IPage<UserCompanyCreditVO> companyCredit(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
      * 仓储提货时间配置
@@ -613,4 +608,5 @@ public interface CommonMapper {
      * @return
      */
     IPage<GoodsStockWarningVO> goodsStockWarningList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("storageIds") List<String> storageIds);
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -565,9 +565,10 @@ public class UserLogic {
 
     }
 
-    public IPage<UserCompanyCreditBean> companyCredit(String nickName, String mobile, Integer pageNum, Integer pageSize) {
+    public IPage<UserCompanyCreditVO> companyCredit(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        return commonMapper.companyCredit(new Page<>(pageNum, pageSize), adminUser.getCompanyWechatId(), nickName, mobile);
+        FieldUtils.supplyParam(zfireParamBean, UserWaitVO.class, commonLogic.getAdminUser());
+        return commonMapper.companyCredit(new Page<>(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
     }
 
     public void companyCreditImport(List<Object> datas) {

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

@@ -1064,22 +1064,17 @@
         ${ex.orderBy}
     </select>
 
-    <select id="companyCredit" resultType="com.gree.mall.manager.bean.member.UserCompanyCreditBean">
+    <select id="companyCredit" resultType="com.gree.mall.manager.bean.member.UserCompanyCreditVO">
         SELECT
-            uca.*,
-            a.nick_name,
-            a.mobile
+        ${ex.selected}
         FROM
-            user a JOIN user_company_credit uca ON a.user_id = uca.user_id
-        WHERE
-            a.type = 'WORKER'
-            AND uca.company_wechat_id = #{companyWechatId}
-        <if test="nickName != null and nickName != ''">
-            AND a.nick_name LIKE CONCAT('%', #{nickName},'%')
-        </if>
-        <if test="mobile != null and mobile != ''">
-            AND a.mobile LIKE CONCAT('%', #{mobile},'%')
+        user_company_credit a JOIN user b ON a.user_id = b.user_id
+        ${ex.query}
+            AND b.type = 'WORKER'
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
         </if>
+        ${ex.orderBy}
     </select>
     <select id="adminCompanyPayConfigList"
             resultType="com.gree.mall.manager.bean.admin.AdminCompanyPayConfigVO">